Merge pull request #301 from stripedpajamas/update-cache-path

Update cache path

DOCS.md

@@ -65,9 +65,9 @@ To copy your settings manually:
 - Copy the contents of settings.json into the same place in VSCodium
 
 ## <a id="portable"></a>How do I run VSCodium in portable mode?
-You can follow the [Portable Mode instructions](https://code.visualstudio.com/docs/editor/portable) from the Visual Studio Code website. For Windows and Linux the instructions can be followed as written. For Mac OS, portable mode is enabled by the existence of a specially named folder. For Visual Studio Code that folder name is `code-portable-data`. For VSCodium, that folder name is `vscodium-portable-data`. 
+You can follow the [Portable Mode instructions](https://code.visualstudio.com/docs/editor/portable) from the Visual Studio Code website. For Windows and Linux the instructions can be followed as written. For Mac OS, portable mode is enabled by the existence of a specially named folder. For Visual Studio Code that folder name is `code-portable-data`. For VSCodium, that folder name is `codium-portable-data`. 
 
-So to enable portable mode for VSCodium on Mac OS, follow the instructions outlined in the link above, but create a folder named `vscodium-portable-data` instead of `code-portable-data`.
+So to enable portable mode for VSCodium on Mac OS, follow the instructions outlined in the link above, but create a folder named `codium-portable-data` instead of `code-portable-data`.
 
 ## <a id="press-and-hold"></a>How do I press and hold a key and have it repeat in VSCodium (Mac)?
 

VSCodium-AppImage-Recipe.yml

@@ -16,7 +16,7 @@ ingredients:
     - deb http://archive.ubuntu.com/ubuntu/ trusty main universe
   script:
     - pwd
-    - cp ../.build/linux/deb/amd64/deb/*.deb .
+    - cp ../vscode/.build/linux/deb/amd64/deb/*.deb .
     - ls codium_*.deb | cut -d _ -f 2 > VERSION
 
 script:

build.sh

@@ -19,6 +19,9 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
   export npm_config_target_arch="$BUILDARCH"
   ../update_settings.sh
 
+  # apply patches
+  patch -u src/vs/platform/update/electron-main/updateService.win32.ts -i ../patches/update-cache-path.patch
+
   yarn
   yarn postinstall
   mv product.json product.json.bak

patches/update-cache-path.patch

@@ -0,0 +1,11 @@
+--- vscode/src/vs/platform/update/electron-main/updateService.win32.ts	2019-12-08 15:09:44.000000000 -0800
++++ src/src/vs/platform/update/electron-main/updateService.win32.ts	2019-12-08 15:12:56.000000000 -0800
+@@ -55,7 +55,7 @@
+ 
+ 	@memoize
+ 	get cachePath(): Promise<string> {
+-		const result = path.join(tmpdir(), `vscode-update-${product.target}-${process.arch}`);
++		const result = path.join(tmpdir(), `vscodium-update-${product.target}-${process.arch}`);
+ 		return pfs.mkdirp(result, undefined).then(() => result);
+ 	}
+ 

src/resources/linux/appimage/pkg2appimage

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # env
-
+ARCH=x86_64
 HERE="$(dirname "$(readlink -f "${0}")")"
 
 # Use privately bundled apt-get and dpkg-deb if available; can be got on trusty using

sum.sh

@@ -27,7 +27,7 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
     sum_file VSCodiumUserSetup-*.exe
     sum_file VSCodium-win32-*.zip
   else # linux
-    cp vscode/out/*.AppImage .
+    cp out/*.AppImage .
     cp vscode/.build/linux/deb/amd64/deb/*.deb .
     cp vscode/.build/linux/rpm/x86_64/*.rpm .