Rename codium

.github/workflows/linux.yml

@@ -23,13 +23,13 @@ jobs:
         include:
         - vscode_arch: x64
           npm_arch: x64
-          image: vscodium/vscodium-linux-build-agent:x64
+          image: vscodium/vscodium-linux-build-agent:bionic-x64
         - vscode_arch: arm64
           npm_arch: arm64
-          image: vscodium/vscodium-linux-build-agent:buster-arm64
+          image: vscodium/vscodium-linux-build-agent:stretch-arm64
         - vscode_arch: armhf
           npm_arch: armv7l
-          image: vscodium/vscodium-linux-build-agent:buster-armhf
+          image: vscodium/vscodium-linux-build-agent:stretch-armhf
 
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -1,2 +1,3 @@
 vscode
-VS*/*
+VS*/*
+.DS_Store

README.md

@@ -43,7 +43,7 @@ If you are on a Mac and have [Homebrew](https://brew.sh/) installed:
 brew install --cask vscodium
 ```
 
-_Note for Mac OS X Mojave users: if you see "App can't be opened because Apple cannot check it for malicious software" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on Mojave._
+_Note for Mac macOS Mojave users: if you see "App can't be opened because Apple cannot check it for malicious software" when opening VSCodium the first time, you can right-click the application and choose Open. This should only be required the first time opening on Mojave._
 
 #### <a id="install-with-winget"></a>Install with Windows Package Manager (WinGet)
 If you use Windows and have [Windows Package Manager](https://github.com/microsoft/winget-cli) installed:
@@ -118,12 +118,12 @@ According to the VS Code Marketplace [Terms of Use](https://aka.ms/vsmarketplace
 Please note that some Visual Studio Code extensions have licenses that restrict their use to the official Visual Studio Code builds and therefore do not work with VSCodium. See [this note](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#proprietary-debugging-tools) on the Docs page for what's been found so far and possible workarounds.
 
 ### How are the VSCodium binaries built?
-If you would like to see the commands we run to build `vscode` into VSCodium binaries, have a look at the workflow files in `.github/workflow` (for Linux and OS X builds) and the `win32-build.yml` file (for Windows builds). These build files call all the other scripts in the repo. If you find something that doesn't make sense, feel free to ask about it [on Gitter](https://gitter.im/VSCodium/Lobby).
+If you would like to see the commands we run to build `vscode` into VSCodium binaries, have a look at the workflow files in `.github/workflow` (for Linux and macOS builds) and the `win32-build.yml` file (for Windows builds). These build files call all the other scripts in the repo. If you find something that doesn't make sense, feel free to ask about it [on Gitter](https://gitter.im/VSCodium/Lobby).
 
 The builds are run every day, but exit early if there isn't a new release from Microsoft. 
 
 ## <a id="supported-os"></a>Supported OS
-- [x] OS X (`zip`, `dmg`)
+- [x] macOS (`zip`, `dmg`)
 - [x] Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)
 - [x] Linux x86 (`deb`, `rpm`, `tar.gz`) ([up to v1.35.1](https://code.visualstudio.com/updates/v1_36#_linux-32bit-support-ends))
 - [x] Linux arm64 (`deb`, `tar.gz`)

VSCodium-AppImage-Recipe.yml

@@ -5,7 +5,7 @@
 # wget -c "https://github.com/AppImage/pkg2appimage/raw/master/pkg2appimage"
 # bash -ex pkg2appimage VSCodium
 
-app: VSCodium
+app: Codium
 
 ingredients:
   packages:
@@ -20,13 +20,16 @@ ingredients:
     - ls codium_*.deb | cut -d _ -f 2 > VERSION
 
 script:
-  - sed -i -e 's|/usr/share/pixmaps/||g' usr/share/applications/codium.desktop
+  - sed -i -e 's|/usr/share/codium/||g' usr/share/applications/codium.desktop
+  - sed -i -e 's|com.visualstudio.code.oss|codium|g' usr/share/applications/codium.desktop
   - cp usr/share/applications/codium.desktop .
-  - cp usr/share/pixmaps/vscodium.png vscodium.png
-  - convert vscodium.png -resize 512x512 usr/share/icons/hicolor/512x512/apps/vscodium.png
-  - convert vscodium.png -resize 256x256 usr/share/icons/hicolor/256x256/apps/vscodium.png
-  - convert vscodium.png -resize 128x128 usr/share/icons/hicolor/128x128/apps/vscodium.png
-  - convert vscodium.png -resize 64x64 usr/share/icons/hicolor/64x64/apps/vscodium.png
-  - convert vscodium.png -resize 48x48 usr/share/icons/hicolor/48x48/apps/vscodium.png
-  - convert vscodium.png -resize 32x32 usr/share/icons/hicolor/32x32/apps/vscodium.png
+  - cp usr/share/pixmaps/codium.png codium.png
+  - convert codium.png -resize 512x512 usr/share/icons/hicolor/512x512/apps/codium.png
+  - convert codium.png -resize 256x256 usr/share/icons/hicolor/256x256/apps/codium.png
+  - convert codium.png -resize 128x128 usr/share/icons/hicolor/128x128/apps/codium.png
+  - convert codium.png -resize 64x64 usr/share/icons/hicolor/64x64/apps/codium.png
+  - convert codium.png -resize 48x48 usr/share/icons/hicolor/48x48/apps/codium.png
+  - convert codium.png -resize 32x32 usr/share/icons/hicolor/32x32/apps/codium.png
+  - convert codium.png -resize 24x24 usr/share/icons/hicolor/24x24/apps/codium.png
+  - convert codium.png -resize 22x22 usr/share/icons/hicolor/22x22/apps/codium.png
   - ( cd usr/bin/ ; ln -s ../share/codium/codium  . )

build.sh

@@ -7,7 +7,33 @@ if [[ "$SHOULD_BUILD" == "yes" ]]; then
 
   echo "LATEST_MS_COMMIT: ${LATEST_MS_COMMIT}"
 
-  . prepare_vscode.sh
+  # set fields in product.json
+  tipsAndTricksUrl='setpath(["tipsAndTricksUrl"]; "https://go.microsoft.com/fwlink/?linkid=852118")'
+  twitterUrl='setpath(["twitterUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533687")'
+  requestFeatureUrl='setpath(["requestFeatureUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533482")'
+  documentationUrl='setpath(["documentationUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533484#vscode")'
+  introductoryVideosUrl='setpath(["introductoryVideosUrl"]; "https://go.microsoft.com/fwlink/?linkid=832146")'
+  extensionAllowedBadgeProviders='setpath(["extensionAllowedBadgeProviders"]; ["api.bintray.com", "api.travis-ci.com", "api.travis-ci.org", "app.fossa.io", "badge.fury.io", "badge.waffle.io", "badgen.net", "badges.frapsoft.com", "badges.gitter.im", "badges.greenkeeper.io", "cdn.travis-ci.com", "cdn.travis-ci.org", "ci.appveyor.com", "circleci.com", "cla.opensource.microsoft.com", "codacy.com", "codeclimate.com", "codecov.io", "coveralls.io", "david-dm.org", "deepscan.io", "dev.azure.com", "flat.badgen.net", "gemnasium.com", "githost.io", "gitlab.com", "godoc.org", "goreportcard.com", "img.shields.io", "isitmaintained.com", "marketplace.visualstudio.com", "nodesecurity.io", "opencollective.com", "snyk.io", "travis-ci.com", "travis-ci.org", "visualstudio.com", "vsmarketplacebadge.apphb.com", "www.bithound.io", "www.versioneye.com"])'
+  updateUrl='setpath(["updateUrl"]; "https://vscodium.now.sh")'
+  releaseNotesUrl='setpath(["releaseNotesUrl"]; "https://go.microsoft.com/fwlink/?LinkID=533483#vscode")'
+  keyboardShortcutsUrlMac='setpath(["keyboardShortcutsUrlMac"]; "https://go.microsoft.com/fwlink/?linkid=832143")'
+  keyboardShortcutsUrlLinux='setpath(["keyboardShortcutsUrlLinux"]; "https://go.microsoft.com/fwlink/?linkid=832144")'
+  keyboardShortcutsUrlWin='setpath(["keyboardShortcutsUrlWin"]; "https://go.microsoft.com/fwlink/?linkid=832145")'
+  quality='setpath(["quality"]; "stable")'
+  extensionsGallery='setpath(["extensionsGallery"]; {"serviceUrl": "https://marketplace.visualstudio.com/_apis/public/gallery", "cacheUrl": "https://vscode.blob.core.windows.net/gallery/index", "itemUrl": "https://marketplace.visualstudio.com/items"})'
+  nameShort='setpath(["nameShort"]; "Codium")'
+  nameLong='setpath(["nameLong"]; "Codium")'
+  linuxIconName='setpath(["linuxIconName"]; "codium")'
+  applicationName='setpath(["applicationName"]; "codium")'
+  win32MutexName='setpath(["win32MutexName"]; "codium")'
+  win32DirName='setpath(["win32DirName"]; "Codium")'
+  win32NameVersion='setpath(["win32NameVersion"]; "Codium")'
+  win32RegValueName='setpath(["win32RegValueName"]; "Codium")'
+  win32AppUserModelId='setpath(["win32AppUserModelId"]; "Microsoft.Codium")'
+  win32ShellNameShort='setpath(["win32ShellNameShort"]; "Codium")'
+  win32x64UserAppId='setpath (["win32x64UserAppId"]; "{{2E1F05D1-C245-4562-81EE-28188DB6FD17}")'
+  urlProtocol='setpath(["urlProtocol"]; "codium")'
+  extensionAllowedProposedApi='setpath(["extensionAllowedProposedApi"]; getpath(["extensionAllowedProposedApi"]) + ["ms-vsliveshare.vsliveshare"])'
 
   cd vscode || exit
 

icons/build_icons.sh

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+check_programs() {
+    for arg in "$@"
+    do
+        if ! command -v $arg >/dev/null 2>&1
+		then
+			echo "$arg could not be found"
+			exit
+		fi
+    done
+}
+
+check_programs "icns2png" "composite" "convert" "png2icns" "icotool"
+
+for file in vscode/resources/darwin/*
+do
+	if [ -f "$file" ]; then
+		name=$(basename $file '.icns')
+
+		if [[ $name != 'code' ]] && [ ! -f "src/resources/darwin/$name.icns" ]; then
+			icns2png -x -s 512x512 $file -o .
+
+			composite -blend 100% -geometry +323+365 icons/corner_512.png "${name}_512x512x32.png" "$name.png"
+			composite icons/code_darwin.png "$name.png" "$name.png"
+
+			convert "$name.png" -resize 256x256 "${name}_256.png"
+
+			png2icns "src/resources/darwin/$name.icns" "$name.png" "${name}_256.png"
+
+			rm "${name}_512x512x32.png" "$name.png" "${name}_256.png"
+		fi
+	fi
+done
+
+for file in vscode/resources/win32/*.ico
+do
+	if [ -f "$file" ]; then
+		name=$(basename $file '.ico')
+
+		if [[ $name != 'code' ]] && [ ! -f "src/resources/win32/$name.ico" ]; then
+			icotool -x -w 256 $file
+
+			composite -geometry +150+185 icons/code_64.png "${name}_9_256x256x32.png" "${name}.png"
+
+			convert "${name}.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "src/resources/win32/$name.ico"
+
+			rm "${name}_9_256x256x32.png" "${name}.png"
+		fi
+	fi
+done
+
+if [ ! -f "src/resources/win32/code.ico" ]; then
+	convert "src/resources/linux/code.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "src/resources/win32/code.ico"
+fi

patches/update-cache-path.patch

@@ -1,11 +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
+--- vscode/src/vs/platform/update/electron-main/updateService.win32.ts	2021-02-05 11:59:17.564060663 -0600
++++ src/src/vs/platform/update/electron-main/updateService.win32.ts	2021-02-05 11:59:39.780745778 -0600
 @@ -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);
+ 		return pfs.mkdirp(result).then(() => result);
  	}
 

sum.sh

@@ -11,19 +11,19 @@ sum_file () {
 
 if [[ "$SHOULD_BUILD" == "yes" ]]; then
   if [[ "$OS_NAME" == "osx" ]]; then
-    sum_file VSCodium-darwin-*.zip
-    sum_file VSCodium*.dmg
+    sum_file Codium-darwin-*.zip
+    sum_file Codium*.dmg
   elif [[ "$OS_NAME" == "windows" ]]; then
-    sum_file VSCodiumSetup-*.exe
-    sum_file VSCodiumUserSetup-*.exe
-    sum_file VSCodium-win32-*.zip
+    sum_file CodiumSetup-*.exe
+    sum_file CodiumUserSetup-*.exe
+    sum_file Codium-win32-*.zip
   else # linux
-    cp out/*.AppImage .
+    cp out/*.AppImage* .
     cp vscode/.build/linux/deb/*/deb/*.deb .
     cp vscode/.build/linux/rpm/*/*.rpm .
 
     sum_file *.AppImage
-    sum_file VSCodium-linux*.tar.gz
+    sum_file Codium-linux*.tar.gz
     sum_file *.deb
     sum_file *.rpm
   fi

update_version.sh

@@ -93,34 +93,34 @@ cd ..
 
 if [[ "$OS_NAME" == "osx" ]]; then
   # zip, sha1, and sha256 files are all at top level dir
-  ASSET_NAME=VSCodium-darwin-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip
-  VERSION_PATH="darwin/${VSCODE_ARCH}"
+  ASSET_NAME=Codium-darwin-${LATEST_MS_TAG}.zip
+  VERSION_PATH="darwin"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 elif [[ "$OS_NAME" == "windows" ]]; then
   # system installer
-  ASSET_NAME=VSCodiumSetup-${VSCODE_ARCH}-${LATEST_MS_TAG}.exe
-  VERSION_PATH="win32/${VSCODE_ARCH}/system"
+  ASSET_NAME=CodiumSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
+  VERSION_PATH="win32/${BUILDARCH}/system"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 
   # user installer
-  ASSET_NAME=VSCodiumUserSetup-${VSCODE_ARCH}-${LATEST_MS_TAG}.exe
-  VERSION_PATH="win32/${VSCODE_ARCH}/user"
+  ASSET_NAME=CodiumUserSetup-${BUILDARCH}-${LATEST_MS_TAG}.exe
+  VERSION_PATH="win32/${BUILDARCH}/user"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 
   # windows archive
-  ASSET_NAME=VSCodium-win32-${VSCODE_ARCH}-${LATEST_MS_TAG}.zip
-  VERSION_PATH="win32/${VSCODE_ARCH}/archive"
+  ASSET_NAME=Codium-win32-${BUILDARCH}-${LATEST_MS_TAG}.zip
+  VERSION_PATH="win32/${BUILDARCH}/archive"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 else # linux
   # update service links to tar.gz file
   # see https://update.code.visualstudio.com/api/update/linux-x64/stable/VERSION
   # as examples
-  ASSET_NAME=VSCodium-linux-${VSCODE_ARCH}-${LATEST_MS_TAG}.tar.gz
-  VERSION_PATH="linux/${VSCODE_ARCH}"
+  ASSET_NAME=Codium-linux-${BUILDARCH}-${LATEST_MS_TAG}.tar.gz
+  VERSION_PATH="linux/${BUILDARCH}"
   JSON="$(generateJson ${ASSET_NAME})"
   updateLatestVersion "$VERSION_PATH" "$JSON"
 fi