small fixes

livecycle · Oct 16, 2023 · 36c100c · 36c100c
1 parent 453fbed
commit 36c100c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/packages/core/src/upload-files/tar.ts b/packages/core/src/upload-files/tar.ts
@@ -1,18 +1,21 @@
 import util from 'util'
 import path from 'path'
 import fs from 'fs'
+import { platform } from 'os'
 import { pack, Headers, Pack } from 'tar-stream'
 import { Writable, pipeline } from 'stream'
 import { EmitterConsumer } from '@preevy/common'
 import { TransferProgressEmitter, TransferProgressEvents, transferProgressEmitter } from './progress'
 import { FileInfo, FileToCopy } from './files'
 import { Visitor, fsWalker } from './walk'
 
+const isWin = platform() === 'win32'
+
 const headerFromStats = (local: FileInfo, remote: string): Headers | undefined => {
   const { stats, symlinkTarget } = local
   const header: Headers = {
     name: remote,
-    mode: stats.mode,
+    mode: isWin ? 0o777 : stats.mode,
     mtime: stats.mtime,
     size: stats.size,
     uid: stats.uid,

diff --git a/packages/driver-gce/src/fs/index.ts b/packages/driver-gce/src/fs/index.ts
@@ -52,7 +52,7 @@ export const googleCloudStorageFs = async (url: string): Promise<VirtualFS> => {
   return {
     read: async (filename: string) => {
       try {
-        const [result] = await bucket.file(path.join(prefix, filename)).download()
+        const [result] = await bucket.file(path.posix.join(prefix, filename)).download()
         return result
       } catch (error) {
         if (!hasErrorCode(error, 404)) {
@@ -63,7 +63,7 @@ export const googleCloudStorageFs = async (url: string): Promise<VirtualFS> => {
     },
     write: async (filename: string, content: Buffer | string) => await stream.promises.pipeline(
       stream.Readable.from(content),
-      bucket.file(path.join(prefix, filename)).createWriteStream(),
+      bucket.file(path.posix.join(prefix, filename)).createWriteStream(),
     ),
     delete: async (filename: string) => {
       try {

diff --git a/packages/driver-lightsail/src/fs/index.ts b/packages/driver-lightsail/src/fs/index.ts
@@ -53,7 +53,7 @@ export const s3fs = async (s3Url: string): Promise<VirtualFS> => {
       try {
         result = await s3.getObject({
           Bucket: bucket,
-          Key: path.join(prefix, filename),
+          Key: path.posix.join(prefix, filename),
         })
       } catch (err) {
         if (isNotFoundError(err)) {
@@ -72,15 +72,15 @@ export const s3fs = async (s3Url: string): Promise<VirtualFS> => {
     async write(filename: string, content: Buffer | string) {
       await s3.putObject({
         Bucket: bucket,
-        Key: path.join(prefix, filename),
+        Key: path.posix.join(prefix, filename),
         Body: content,
       })
     },
     async delete(filename: string) {
       try {
         await s3.deleteObject({
           Bucket: bucket,
-          Key: path.join(prefix, filename),
+          Key: path.posix.join(prefix, filename),
         })
       } catch (err) {
         if (isNotFoundError(err)) {