fix path issues on windows w/o breaking osx (#25041)

keybase · Jun 6, 2022 · 0ee8d30 · 0ee8d30
1 parent 25e1d44
commit 0ee8d30
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/shared/constants/platform.desktop.tsx b/shared/constants/platform.desktop.tsx
@@ -140,4 +140,4 @@ const uses24HourClockF = () => {
   }
 }
 export const uses24HourClock = uses24HourClockF()
-export const getAssetPath = (...a: Array<string>) => [KB2.constants.assetRoot, ...a].join('/')
+export const getAssetPath = (...a: Array<string>) => KB2.constants.assetRoot + a.join('/')
diff --git a/shared/desktop/app/kb2-impl.desktop.tsx b/shared/desktop/app/kb2-impl.desktop.tsx
@@ -15,7 +15,7 @@ if (pathSep !== '/' && pathSep !== '\\') {
 }
 
 const kb2: KB2['constants'] = {
-  assetRoot: path.resolve(__DEV__ ? '.' : app.getAppPath()),
+  assetRoot: path.resolve(__DEV__ ? '.' : app.getAppPath()).replaceAll('\\', '/') + '/',
   configOverload: {}, // filled in later
   dokanPath: path.resolve(env.LOCALAPPDATA ?? '', 'Keybase', 'DokanSetup_redist.exe'),
   downloadFolder: path.join(os.homedir(), 'Downloads'),