fix: update api proposals (#1187)

* docs: update supported macOS and link to troubleshooting wiki
* docs: add thanks table

.github/workflows/linux.yml

@@ -27,9 +27,9 @@ jobs:
         - vscode_arch: arm64
           npm_arch: arm64
           image: vscodium/vscodium-linux-build-agent:stretch-arm64
-        # - vscode_arch: armhf
-        #   npm_arch: armv7l
-        #   image: vscodium/vscodium-linux-build-agent:stretch-armhf
+        - vscode_arch: armhf
+          npm_arch: armv7l
+          image: vscodium/vscodium-linux-build-agent:stretch-armhf
 
     steps:
       - uses: actions/checkout@v3
@@ -116,7 +116,7 @@ jobs:
         run: ./stores/snapcraft/check_version.sh
         env:
           ARCHITECTURE: ${{ matrix.platform }}
-          SNAP_STORE_LOGIN: ${{ secrets.SNAP_STORE_LOGIN }}
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
 
       # - uses: docker/setup-qemu-action@v1
       #   if: env.SHOULD_DEPLOY == 'yes'
@@ -140,9 +140,10 @@ jobs:
         if: env.SHOULD_DEPLOY == 'yes'
 
 
-      - uses: snapcore/action-publish@v1
+      - uses: snapcore/action-publish@master
+        env:
+          SNAPCRAFT_STORE_CREDENTIALS: ${{ secrets.SNAP_STORE_LOGIN }}
         with:
-          store_login: ${{ secrets.SNAP_STORE_LOGIN }}
           snap: ${{ steps.build.outputs.snap }}
           release: stable
         if: env.SHOULD_DEPLOY == 'yes'

.github/workflows/lock.yml

@@ -0,0 +1,15 @@
+name: Lock Threads
+
+on:
+  schedule:
+    - cron: '0 0 * * Mon'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v3
+        with:
+          github-token: ${{ github.token }}
+          issue-inactive-days: '90'
+          pr-inactive-days: '90'

.github/workflows/windows.yml

@@ -22,7 +22,7 @@ jobs:
       matrix:
         vscode_arch:
           - x64
-          # - ia32
+          - ia32
           - arm64
 
     steps:
@@ -96,3 +96,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.STRONGER_GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ github.repository_owner }}
 
+      - if: env.SHOULD_BUILD == 'yes' && env.SHOULD_DEPLOY == 'yes'
+        name: Release to WinGet
+        uses: vedantmgoyal2009/winget-releaser@latest
+        with:
+          identifier: VSCodium.VSCodium
+          release-tag: env.MS_TAG
+          installers-regex: '\.exe$' # only .exe files
+          token: ${{ secrets.STRONGER_GITHUB_TOKEN }}

.gitignore

@@ -1,5 +1,6 @@
 vscode
 VS*/*
+VSCode*
 .DS_Store
 build/linux/appimage/out
 build/linux/appimage/pkg2appimage.AppDir
@@ -7,5 +8,5 @@ build/linux/appimage/pkg2appimage-*.AppImage
 build/linux/appimage/squashfs-root
 build/linux/appimage/VSCodium
 build/windows/msi/releasedir
-build/windows/rtf/Readme (Abridged).txt
-build/windows/rtf/TXT to RTF Converter.exe
+build/windows/msi/Files*.wxs
+build/windows/msi/Files*.wixobj

DOCS.md

@@ -53,7 +53,7 @@ See [this article](https://www.gitpod.io/blog/open-vsx/) for more information on
 
 ### <a id="howto-vscode-marketplace"></a>How to use the VS Code Marketplace
 
-You can switch and use the VS Code marketplace by using the following solutions. However, note that [it is not clear whether this is legal](https://github.com/microsoft/vscode/issues/31168).
+You can switch and use the VS Code marketplace by using the following solutions. However, note that [ this is not legal](https://github.com/microsoft/vscode/issues/31168).
 
 With the following environment variables:
 - `VSCODE_GALLERY_SERVICE_URL='https://marketplace.visualstudio.com/_apis/public/gallery'`

README.md

@@ -22,6 +22,7 @@
 **This is not a fork. This is a repository of scripts to automatically build Microsoft's `vscode` repository into freely-licensed binaries with a community-driven default configuration.**
 
 ## Table of Contents
+
 - [Download/Install](#download-install)
   - [Install with Brew](#install-with-brew)
   - [Install with Windows Package Manager (WinGet)](#install-with-winget)
@@ -37,31 +38,36 @@
 - [Supported Platforms](#supported-platforms)
 
 ## <a id="download-install"></a>Download/Install
+
 :tada: :tada: [Download latest release here](https://github.com/VSCodium/vscodium/releases) :tada: :tada:
 
 [More info / helpful tips are here.](https://github.com/VSCodium/vscodium/blob/master/DOCS.md)
 
 #### <a id="install-with-brew"></a>Install with Brew (Mac)
+
 If you are on a Mac and have [Homebrew](https://brew.sh/) installed:
 ```bash
 brew install --cask vscodium
 ```
 
-_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._
+*Note for macOS users: if you can't open the App, please read [the following troubleshooting](https://github.com/VSCodium/vscodium/wiki/Troubleshooting#macos).*
 
 #### <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:
 ```bash
 winget install vscodium
 ```
 
 #### <a id="install-with-choco"></a>Install with Chocolatey (Windows)
+
 If you use Windows and have [Chocolatey](https://chocolatey.org) installed (thanks to [@Thilas](https://github.com/Thilas)):
 ```bash
 choco install vscodium
 ```
 
 #### <a id="install-with-scoop"></a>Install with Scoop (Windows)
+
 If you use Windows and have [Scoop](https://scoop.sh) installed:
 ```bash
 scoop bucket add extras
@@ -69,6 +75,7 @@ scoop install vscodium
 ```
 
 #### <a id="install-with-snap"></a>Install with snap (GNU/Linux)
+
 VSCodium is available in the [Snap Store](https://snapcraft.io/) as [Codium](https://snapcraft.io/codium), thanks to the help of the [Snapcrafters](https://github.com/snapcrafters/codium) community.
 If your GNU/Linux distribution has support for [snaps](https://snapcraft.io/docs/installing-snapd):
 ```bash
@@ -76,12 +83,15 @@ snap install codium --classic
 ```
 
 #### <a id="install-with-package-manager"></a>Install with Package Manager (GNU/Linux)
+
 You can always install using the downloads (deb, rpm, tar) on the [releases page](https://github.com/VSCodium/vscodium/releases), but you can also install using your favorite package manager and get automatic updates. [@paulcarroty](https://github.com/paulcarroty) has set up a repository with instructions [here](https://gitlab.com/paulcarroty/vscodium-deb-rpm-repo). Any issues installing VSCodium using your package manager should be directed to that repository's issue tracker.
 
 #### <a id="install-on-arch-linux"></a>Install on Arch Linux
+
 VSCodium is available in [AUR](https://wiki.archlinux.org/index.php/Arch_User_Repository) as package [vscodium-bin](https://aur.archlinux.org/packages/vscodium-bin/), maintained by [@binex-dsk](https://github.com/binex-dsk). An alternative package [vscodium-git](https://aur.archlinux.org/packages/vscodium-git/), maintained by [@cedricroijakkers](https://github.com/cedricroijakkers), is also available should you wish to compile from source yourself.
 
 #### <a id="flatpak"></a>Flatpak Option (GNU/Linux)
+
 VSCodium is (unofficially) available as a Flatpak app [here](https://flathub.org/apps/details/com.vscodium.codium) and the build repo is [here](https://github.com/flathub/com.vscodium.codium). If your distribution has support for [flatpak](https://flathub.org), and you have enabled the [flathub repo](https://flatpak.org/setup/):
 ```bash
 flatpak install flathub com.vscodium.codium
@@ -90,9 +100,11 @@ flatpak run com.vscodium.codium
 ```
 
 ## <a id="build"></a>Build
+
 Build instructions can be found [here](https://github.com/VSCodium/vscodium/blob/master/docs/build.md)
 
 ## <a id="why"></a>Why Does This Exist
+
 This repository contains build files to generate free release binaries of Microsoft's VS Code. When we speak of "free software", we're talking about freedom, not price.
 
 Microsoft's releases of Visual Studio Code are licensed under [this not-FLOSS license](https://code.visualstudio.com/license) and contain telemetry/tracking. According to [this comment](https://github.com/Microsoft/vscode/issues/60#issuecomment-161792005) from a Visual Studio Code maintainer:
@@ -119,22 +131,26 @@ Microsoft's build process (which we are running to build the binaries) does down
 ## <a id="more-info"></a>More Info
 
 ### Documentation
+
 For more information on getting all the telemetry disabled and tips for migrating from Visual Studio Code to VSCodium, have a look at this [Docs](https://github.com/VSCodium/vscodium/blob/master/DOCS.md) page.
 
 ### Extensions and the Marketplace
+
 According to the VS Code Marketplace [Terms of Use](https://aka.ms/vsmarketplace-ToU), _you may only install and use Marketplace Offerings with Visual Studio Products and Services._ For this reason, VSCodium uses [open-vsx.org](https://open-vsx.org/), an open source registry for VS Code extensions. See the [Extensions + Marketplace](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#extensions-marketplace) section on the Docs page for more details.
 
 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/workflows` for Windows, GNU/Linux and macOS. 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-platforms"></a>Supported Platforms
-The minimal version is limited by the core component Electron, you may want to check its [supported platform list](https://www.electronjs.org/docs/tutorial/support#supported-platforms).
+
+The minimal version is limited by the core component Electron, you may want to check its [platform prerequisites](https://www.electronjs.org/docs/latest/development/build-instructions-gn#platform-prerequisites).
 - [x] macOS (`zip`, `dmg`) OS X 10.10 or newer x64
-- [x] macOS (`zip`, `dmg`) macOS 11.0 or newer arm64 via x64 emulation, see [status issue](https://github.com/VSCodium/vscodium/issues/597)
+- [x] macOS (`zip`, `dmg`) macOS 11.0 or newer arm64
 - [x] GNU/Linux x64 (`deb`, `rpm`, `AppImage`, `tar.gz`)
 - [x] GNU/Linux x86 (`deb`, `rpm`, `tar.gz`) ([up to v1.35.1](https://code.visualstudio.com/updates/v1_36#_linux-32bit-support-ends))
 - [x] GNU/Linux arm64 (`deb`, `tar.gz`)
@@ -144,11 +160,30 @@ The minimal version is limited by the core component Electron, you may want to c
 - [x] Windows 10 arm64
 
 ## <a id="donate"></a>Donate
+
 If you would like to support the development of VSCodium, feel free to send BTC to `3PgjE95yzBDTrSPxPiqoxSgZFuKPPAix1N`.
 
 Special thanks to:
-- @estatra for the latest logo
-- @jaredreich for the previous logo
+
+<table>
+  <tr>
+    <td>@estatra</td>
+    <td>for the latest logo</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/jaredreich" target="_blank">@jaredreich</a></td>
+    <td>for the previous logo</td>
+  </tr>
+  <tr>
+    <td><a href="https://github.com/PalinuroSec" target="_blank">@PalinuroSec</a></td>
+    <td>for CDN and domain name</td>
+  </tr>
+  <tr>
+    <td><a href="https://www.macstadium.com" target="_blank"><img src="https://images.prismic.io/macstadium/66fbce64-707e-41f3-b547-241908884716_MacStadium_Logo.png?w=128&q=75" width="128" height="49" alt="MacStadium logo" /></a></td>
+    <td>for providing a Mac mini M1</td>
+  </tr>
+</table>
 
 ## <a id="license"></a>License
+
 [MIT](https://github.com/VSCodium/vscodium/blob/master/LICENSE)

build.sh

@@ -10,7 +10,7 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
 
   . prepare_vscode.sh
 
-  cd vscode || exit
+  cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
   yarn monaco-compile-check
   yarn valid-layers-check
@@ -22,6 +22,10 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
 
   if [[ "${OS_NAME}" == "osx" ]]; then
     yarn gulp "vscode-darwin-${VSCODE_ARCH}-min-ci"
+
+    find "../VSCode-darwin-${VSCODE_ARCH}" -exec touch {} \;
+
+    VSCODE_PLATFORM="darwin"
   elif [[ "${OS_NAME}" == "windows" ]]; then
     . ../build/windows/rtf/make.sh
 
@@ -48,10 +52,16 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
       if [[ "${SHOULD_BUILD_MSI_NOUP}" != "no" ]]; then
         . ../build/windows/msi/build-updates-disabled.sh
       fi
+    else
+      SHOULD_BUILD_REH="no"
     fi
+
+    VSCODE_PLATFORM="win32"
   else # linux
     yarn gulp "vscode-linux-${VSCODE_ARCH}-min-ci"
 
+    find "../VSCode-linux-${VSCODE_ARCH}" -exec touch {} \;
+
     if [[ "${SKIP_LINUX_PACKAGES}" != "True" ]]; then
       if [[ "${SHOULD_BUILD_DEB}" != "no" || "${SHOULD_BUILD_APPIMAGE}" != "no" ]]; then
         yarn gulp "vscode-linux-${VSCODE_ARCH}-build-deb"
@@ -65,6 +75,13 @@ if [[ "${SHOULD_BUILD}" == "yes" ]]; then
         . ../build/linux/appimage/build.sh
       fi
     fi
+
+    VSCODE_PLATFORM="linux"
+  fi
+
+  if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
+    yarn gulp minify-vscode-reh
+    yarn gulp "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-min-ci"
   fi
 
   cd ..

build/build_macos.sh

@@ -3,6 +3,16 @@
 rm -rf VSCode*
 rm -rf vscode
 
+UNAME_ARCH=$( uname -m )
+
+if [[ "${UNAME_ARCH}" == "arm64" ]]; then
+    export VSCODE_ARCH="arm64"
+else
+    export VSCODE_ARCH="x64"
+fi
+
+echo "-- VSCODE_ARCH: ${VSCODE_ARCH}"
+
 . get_repo.sh
 
-SHOULD_BUILD=yes CI_BUILD=no OS_NAME=osx VSCODE_ARCH=x64 . build.sh
+SHOULD_BUILD=yes CI_BUILD=no OS_NAME=osx . build.sh

build/linux/appimage/build.sh

@@ -6,7 +6,7 @@ CALLER_DIR=$( pwd )
 
 cd "$( dirname "${BASH_SOURCE[0]}" )"
 
-if [[ "$VSCODE_ARCH" == "x64" ]]; then
+if [[ "${VSCODE_ARCH}" == "x64" ]]; then
   wget -c https://github.com/$(wget -q https://github.com/AppImage/pkg2appimage/releases -O - | grep "pkg2appimage-.*-x86_64.AppImage" | head -n 1 | cut -d '"' -f 2)
   chmod +x ./pkg2appimage-*.AppImage
 

build/update_api.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+URL=`curl -s "https://update.code.visualstudio.com/api/update/win32-x64-archive/stable/VERSION" | jq -c '.url' | sed -E 's/.*"([^"]+)".*/\1/'`
+# echo "url: ${URL}"
+FILE=`echo "${URL}" | sed -E 's|.*/([^/]+\.zip)$|\1|'`
+# echo "file: ${FILE}"
+DIRECTORY=`echo "${URL}" | sed -E 's|.*/([^/]+)\.zip$|\1|'`
+# echo "directory: ${DIRECTORY}"
+
+if [[ ! -f "${FILE}" ]]; then
+  wget "${URL}"
+fi
+
+if [[ ! -d "${DIRECTORY}" ]]; then
+  unzip "${FILE}" -d "${DIRECTORY}"
+fi
+
+APIS=`cat ${DIRECTORY}/resources/app/product.json | jq -r '.extensionEnabledApiProposals'`
+
+cat <<< $(jq --argjson v "${APIS}" 'setpath(["extensionEnabledApiProposals"]; $v)' product.json) > product.json

build/update_patches.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
+
+git add .
+git reset -q --hard HEAD
+
+for file in ../patches/*.patch; do
+  if [ -f "${file}" ]; then
+    echo applying patch: "${file}"
+    git apply --ignore-whitespace "${file}"
+    if [ $? -ne 0 ]; then
+      echo failed to apply patch "${file}"
+      git apply --reject "${file}"
+      read -p "Press any key when the conflict have been resolved..." -n1 -s
+      git diff > "${file}"
+    fi
+    git add .
+    git reset -q --hard HEAD
+  fi
+done

build/windows/msi/build-updates-disabled.sh

@@ -8,7 +8,7 @@ cd "$( dirname "${BASH_SOURCE[0]}" )"
 
 SCRIPT_DIR=$( pwd )
 
-cd ../../../VSCode-win32-${VSCODE_ARCH}/resources/app
+cd "../../../VSCode-win32-${VSCODE_ARCH}/resources/app"
 
 cp product.json product.json.bak
 cat product.json.bak | jq "del(.updateUrl)" > product.json
@@ -16,6 +16,6 @@ rm -f product.json.bak
 
 cd "${SCRIPT_DIR}"
 
-. build.sh "updates-disabled"
+./build.sh "updates-disabled"
 
 cd "${CALLER_DIR}"

build/windows/msi/build.sh

@@ -24,10 +24,10 @@ ICON_DIR="..\\..\\..\\src\\resources\\win32"
 LICENSE_DIR="..\\..\\..\\vscode"
 PROGRAM_FILES_86=$( env | sed -n 's/^ProgramFiles(x86)=//p' )
 
-if [[ -z "$1" ]]; then
+if [[ -z "${1}" ]]; then
 	OUTPUT_BASE_FILENAME="${PRODUCT_NAME}-${VSCODE_ARCH}-${MS_TAG}"
 else
-	OUTPUT_BASE_FILENAME="${PRODUCT_NAME}-${VSCODE_ARCH}-$1-${MS_TAG}"
+	OUTPUT_BASE_FILENAME="${PRODUCT_NAME}-${VSCODE_ARCH}-${1}-${MS_TAG}"
 fi
 
 if [[ "${VSCODE_ARCH}" == "ia32" ]]; then
@@ -38,8 +38,8 @@ fi
 
 
 BuildSetupTranslationTransform() {
-	local CULTURE=$1
-	local LANGID=$2
+	local CULTURE=${1}
+	local LANGID=${2}
 
 	LANGIDS="${LANGIDS},${LANGID}"
 
@@ -47,13 +47,13 @@ BuildSetupTranslationTransform() {
 	
 	"${WIX}bin\\light.exe" vscodium.wixobj "Files-${OUTPUT_BASE_FILENAME}.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetFxExtension -spdb -cc "${TEMP}\\vscodium-cab-cache\\${PLATFORM}" -reusecab -out "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi" -loc "i18n\\${PRODUCT_SKU}.${CULTURE}.wxl" -cultures:"${CULTURE}" -sice:ICE60 -sice:ICE69
 	
-	cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\WiLangId.vbs" ${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi Product "${LANGID}"
+	cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\WiLangId.vbs" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi" Product "${LANGID}"
 	
 	"${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\x86\\msitran" -g "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.mst"
 	
-	cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\wisubstg.vbs" ${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi ${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.mst "${LANGID}"
+	cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\wisubstg.vbs" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.mst" "${LANGID}"
 	
-	cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\wisubstg.vbs" ${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi
+	cscript "${PROGRAM_FILES_86}\\Windows Kits\\${WIN_SDK_MAJOR_VERSION}\\bin\\${WIN_SDK_FULL_VERSION}\\${PLATFORM}\\wisubstg.vbs" "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.msi"
 
 	rm -f "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.msi"
 	rm -f "${SETUP_RELEASE_DIR}\\${OUTPUT_BASE_FILENAME}.${CULTURE}.mst"

build/windows/rtf/make.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd "$( dirname "${BASH_SOURCE[0]}" )"/../../../vscode
+cd "$( dirname "${BASH_SOURCE[0]}" )"/../../../vscode || { echo "'vscode' dir not found"; exit 1; }
 
 input=LICENSE.txt
 target=LICENSE.rtf

check_cron_or_pr.sh

@@ -2,12 +2,12 @@
 
 set -e
 
-if [[ $GITHUB_EVENT_NAME == "pull_request" ]]; then
+if [[ "${GITHUB_EVENT_NAME}" == "pull_request" ]]; then
 	echo "It's a PR"
 	
 	export SHOULD_BUILD="yes"
 	export SHOULD_DEPLOY="no"
-elif [[ $GITHUB_EVENT_NAME == "push" ]]; then
+elif [[ "${GITHUB_EVENT_NAME}" == "push" ]]; then
 	echo "It's a Push"
 	
 	export SHOULD_BUILD="yes"
@@ -18,7 +18,7 @@ else
 	export SHOULD_DEPLOY="yes"
 fi
 
-if [[ $GITHUB_ENV ]]; then
-	echo "SHOULD_BUILD=$SHOULD_BUILD" >> $GITHUB_ENV
-	echo "SHOULD_DEPLOY=$SHOULD_DEPLOY" >> $GITHUB_ENV
+if [[ "${GITHUB_ENV}" ]]; then
+	echo "SHOULD_BUILD=${SHOULD_BUILD}" >> "${GITHUB_ENV}"
+	echo "SHOULD_DEPLOY=${SHOULD_DEPLOY}" >> "${GITHUB_ENV}"
 fi

check_tags.sh

@@ -8,18 +8,18 @@ if [[ -z "${GITHUB_TOKEN}" ]]; then
 fi
 
 REPOSITORY="${GITHUB_REPOSITORY:-"VSCodium/vscodium"}"
-GITHUB_RESPONSE=$( curl -s -H "Authorization: token ${GITHUB_TOKEN}" https://api.github.com/repos/${REPOSITORY}/releases/tags/${MS_TAG})
+GITHUB_RESPONSE=$( curl -s -H "Authorization: token ${GITHUB_TOKEN}" "https://api.github.com/repos/${REPOSITORY}/releases/tags/${MS_TAG}")
 VSCODIUM_ASSETS=$( echo "${GITHUB_RESPONSE}" | jq -c '.assets | map(.name)?' )
 
 contains() {
   # add " to match the end of a string so any hashs won't be matched by mistake
-  echo "${VSCODIUM_ASSETS}" | grep "$1\""
+  echo "${VSCODIUM_ASSETS}" | grep "${1}\""
 }
 
 if [ "${VSCODIUM_ASSETS}" != "null" ]; then
   # macos
   if [[ "${OS_NAME}" == "osx" ]]; then
-    if [[ -z $( contains "darwin-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
+    if [[ -z $( contains "VSCodium-darwin-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
       echo "Building on MacOS because we have no ZIP"
       export SHOULD_BUILD="yes"
     else
@@ -33,6 +33,13 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
       export SHOULD_BUILD_DMG="no"
     fi
 
+    if [[ -z $( contains "vscodium-reh-darwin-${VSCODE_ARCH}-${MS_TAG}.tar.gz" ) ]]; then
+      echo "Building on MacOS because we have no REH archive"
+      export SHOULD_BUILD="yes"
+    else
+      export SHOULD_BUILD_REH="no"
+    fi
+
     if [[ "${SHOULD_BUILD}" != "yes" ]]; then
       echo "Already have all the MacOS builds"
     fi
@@ -54,13 +61,15 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
         export SHOULD_BUILD_EXE_USR="no"
       fi
 
-      if [[ -z $( contains "win32-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
+      if [[ -z $( contains "VSCodium-win32-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
         echo "Building on Windows arm64 because we have no zip"
         export SHOULD_BUILD="yes"
       else
         export SHOULD_BUILD_ZIP="no"
       fi
 
+      export SHOULD_BUILD_REH="no"
+
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
         echo "Already have all the Windows arm64 builds"
       fi
@@ -81,7 +90,7 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
         export SHOULD_BUILD_EXE_USR="no"
       fi
 
-      if [[ -z $( contains "win32-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
+      if [[ -z $( contains "VSCodium-win32-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
         echo "Building on Windows ia32 because we have no zip"
         export SHOULD_BUILD="yes"
       else
@@ -102,6 +111,13 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
         export SHOULD_BUILD_MSI_NOUP="no"
       fi
 
+      if [[ -z $( contains "vscodium-reh-win32-${VSCODE_ARCH}-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Windows ia32 because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH="no"
+      fi
+
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
         echo "Already have all the Windows ia32 builds"
       fi
@@ -122,7 +138,7 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
         export SHOULD_BUILD_EXE_USR="no"
       fi
 
-      if [[ -z $( contains "win32-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
+      if [[ -z $( contains "VSCodium-win32-${VSCODE_ARCH}-${MS_TAG}.zip" ) ]]; then
         echo "Building on Windows x64 because we have no zip"
         export SHOULD_BUILD="yes"
       else
@@ -143,6 +159,13 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
         export SHOULD_BUILD_MSI_NOUP="no"
       fi
 
+      if [[ -z $( contains "vscodium-reh-win32-${VSCODE_ARCH}-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Windows x64 because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH="no"
+      fi
+
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
         echo "Already have all the Windows x64 builds"
       fi
@@ -165,13 +188,20 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
         export SHOULD_BUILD_RPM="no"
       fi
 
-      if [[ -z $( contains "arm64-${MS_TAG}.tar.gz" ) ]]; then
+      if [[ -z $( contains "VSCodium-linux-arm64-${MS_TAG}.tar.gz" ) ]]; then
         echo "Building on Linux arm64 because we have no TAR"
         export SHOULD_BUILD="yes"
       else
         export SHOULD_BUILD_TAR="no"
       fi
 
+      if [[ -z $( contains "vscodium-reh-linux-arm64-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Linux arm64 because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH="no"
+      fi
+
       export SHOULD_BUILD_APPIMAGE="no"
 
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
@@ -194,13 +224,20 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
         export SHOULD_BUILD_RPM="no"
       fi
 
-      if [[ -z $( contains "armhf-${MS_TAG}.tar.gz" ) ]]; then
+      if [[ -z $( contains "VSCodium-linux-armhf-${MS_TAG}.tar.gz" ) ]]; then
         echo "Building on Linux arm because we have no TAR"
         export SHOULD_BUILD="yes"
       else
         export SHOULD_BUILD_TAR="no"
       fi
 
+      if [[ -z $( contains "vscodium-reh-linux-armhf-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Linux arm because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH="no"
+      fi
+
       export SHOULD_BUILD_APPIMAGE="no"
 
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
@@ -223,7 +260,7 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
         export SHOULD_BUILD_RPM="no"
       fi
 
-      if [[ -z $( contains "x64-${MS_TAG}.tar.gz" ) ]]; then
+      if [[ -z $( contains "VSCodium-linux-x64-${MS_TAG}.tar.gz" ) ]]; then
         echo "Building on Linux x64 because we have no TAR"
         export SHOULD_BUILD="yes"
       else
@@ -237,6 +274,13 @@ if [ "${VSCODIUM_ASSETS}" != "null" ]; then
         export SHOULD_BUILD_APPIMAGE="no"
       fi
 
+      if [[ -z $( contains "vscodium-reh-linux-x64-${MS_TAG}.tar.gz" ) ]]; then
+        echo "Building on Linux x64 because we have no REH archive"
+        export SHOULD_BUILD="yes"
+      else
+        export SHOULD_BUILD_REH="no"
+      fi
+
       if [[ "${SHOULD_BUILD}" != "yes" ]]; then
         echo "Already have all the Linux x64 builds"
       fi
@@ -255,6 +299,7 @@ echo "SHOULD_BUILD_EXE_SYS=${SHOULD_BUILD_EXE_SYS}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_EXE_USR=${SHOULD_BUILD_EXE_USR}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_MSI=${SHOULD_BUILD_MSI}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_MSI_NOUP=${SHOULD_BUILD_MSI_NOUP}" >> "${GITHUB_ENV}"
+echo "SHOULD_BUILD_REH=${SHOULD_BUILD_REH}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_RPM=${SHOULD_BUILD_RPM}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_TAR=${SHOULD_BUILD_TAR}" >> "${GITHUB_ENV}"
 echo "SHOULD_BUILD_ZIP=${SHOULD_BUILD_ZIP}" >> "${GITHUB_ENV}"

docs/build.md

@@ -8,6 +8,11 @@
   - [Windows](#dependencies-windows)
 - [Build Scripts](#build-scripts)
 - [Build in Docker](#build-docker)
+  - [X64](#build-docker-x64)
+  - [ARM 32bits](#build-docker-arm32)
+- [Patch Update Process](#patch-update-process)
+  - [Semi-Automated](#patch-update-process-semiauto)
+  - [Manual](#patch-update-process-manual)
 
 ## <a id="dependencies"></a>Dependencies
 
@@ -29,8 +34,8 @@
 - rpmbuild
 - dpkg
 - python3
-- libsecret-1-dev
 - imagemagick (for AppImage)
+- ripgrep
 
 ### <a id="dependencies-macos"></a>MacOS
 
@@ -55,10 +60,16 @@ Each platform has its build helper script in the directory `build`.
 
 To build for Linux, you can alternatively build VSCodium in docker
 
+### <a id="build-docker-x64"></a>X64
+
 Firstly, create the container with:
 ```
 docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-x64 bash
 ```
+like
+```
+docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:bionic-x64 bash
+```
 
 When inside the container, you can use the following commands to build:
 ```
@@ -67,9 +78,7 @@ sudo apt-get install -y nodejs desktop-file-utils
 
 npm install -g yarn
 
-git clone https://github.com/VSCodium/vscodium.git
-
-cd vscodium
+cd /root/vscodium
 
 ./get_repo.sh
 
@@ -79,3 +88,55 @@ export VSCODE_ARCH=x64
 
 ./build.sh
 ```
+
+### <a id="build-docker-arm32"></a>ARM 32bits
+
+Firstly, create the container with:
+```
+docker run -ti --volume=<local vscodium source>:/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:stretch-armhf bash
+```
+like
+```
+docker run -ti --volume=$(pwd):/root/vscodium --name=vscodium-build-agent vscodium/vscodium-linux-build-agent:stretch-armhf bash
+```
+
+When inside the container, you can use the following commands to build:
+```
+curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
+sudo apt-get install -y nodejs desktop-file-utils
+
+cd /root/vscodium
+
+./get_repo.sh
+
+export SHOULD_BUILD=yes
+export OS_NAME=linux
+export VSCODE_ARCH=armhf
+export npm_config_arch=armv7l
+export npm_config_force_process_config="true"
+
+./build.sh
+```
+
+## <a id="patch-update-process"></a>Patch Update Process
+
+## <a id="patch-update-process-semiauto"></a>Semi-Automated
+
+- run `./build/build_<os>.sh`, if a patch is failing then,
+- run `./build/update_patches.sh`
+- when the script pause at `Press any key when the conflict have been resolved...`, open `vscode` directory in **VSCodium**
+- fix all the `*.rej` files
+- run `yarn watch`
+- run `./script/code.sh` until everything ok
+- press any key to continue the script `update_patches.sh`
+
+## <a id="patch-update-process-manual"></a>Manual
+
+- run `./build/build_<os>.sh`, if a patch is failing then,
+- open `vscode` directory in **VSCodium**
+- revert all changes
+- run `git apply --reject ../patches/<name>.patch`
+- fix all the `*.rej` files
+- run `yarn watch`
+- run `./script/code.sh` until everything ok
+- run `git diff > ../patches/<name>.patch`

get_repo.sh

@@ -1,20 +1,20 @@
 #!/bin/bash
 
 mkdir -p vscode
-cd vscode
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
 git init -q
 git remote add origin https://github.com/Microsoft/vscode.git
 
 # figure out latest tag by calling MS update API
-if [ "$INSIDER" == "1" ]; then
+if [ "${INSIDER}" == "1" ]; then
   UPDATE_INFO=$(curl https://update.code.visualstudio.com/api/update/darwin/insider/lol)
-  export MS_COMMIT=$(echo $UPDATE_INFO | jq -r '.version')
-  export MS_TAG=$(echo $UPDATE_INFO | jq -r '.name')
+  export MS_COMMIT=$(echo "${UPDATE_INFO}" | jq -r '.version')
+  export MS_TAG=$(echo "${UPDATE_INFO}" | jq -r '.name')
 elif [[ -z "${MS_TAG}" ]]; then
   UPDATE_INFO=$(curl https://update.code.visualstudio.com/api/update/darwin/stable/lol)
-  export MS_COMMIT=$(echo $UPDATE_INFO | jq -r '.version')
-  export MS_TAG=$(echo $UPDATE_INFO | jq -r '.name')
+  export MS_COMMIT=$(echo "${UPDATE_INFO}" | jq -r '.version')
+  export MS_TAG=$(echo "${UPDATE_INFO}" | jq -r '.name')
 else
   reference=$( git ls-remote --tags | grep -x ".*refs\/tags\/${MS_TAG}" | head -1 )
 
@@ -32,13 +32,13 @@ fi
 
 echo "Got the MS tag: ${MS_TAG} version: ${MS_COMMIT}"
 
-git fetch --depth 1 origin $MS_COMMIT
+git fetch --depth 1 origin "${MS_COMMIT}"
 git checkout FETCH_HEAD
 
 cd ..
 
 # for GH actions
-if [[ $GITHUB_ENV ]]; then
-  echo "MS_TAG=$MS_TAG" >> $GITHUB_ENV
-  echo "MS_COMMIT=$MS_COMMIT" >> $GITHUB_ENV
+if [[ ${GITHUB_ENV} ]]; then
+  echo "MS_TAG=${MS_TAG}" >> "${GITHUB_ENV}"
+  echo "MS_COMMIT=${MS_COMMIT}" >> "${GITHUB_ENV}"
 fi

icons/build_icons.sh

@@ -8,9 +8,9 @@ set -e
 check_programs() {
   for arg in "$@"
   do
-    if ! command -v $arg >/dev/null 2>&1
+    if ! command -v "${arg}" >/dev/null 2>&1
     then
-      echo "$arg could not be found"
+      echo "${arg} could not be found"
       exit
     fi
   done
@@ -22,22 +22,22 @@ SRC_PREFIX=""
 VSCODE_PREFIX=""
 
 build_darwin_types() {
-  for file in ${VSCODE_PREFIX}vscode/resources/darwin/*
+  for file in "${VSCODE_PREFIX}"vscode/resources/darwin/*
   do
-    if [ -f "$file" ]; then
-      name=$(basename $file '.icns')
+    if [ -f "${file}" ]; then
+      name=$(basename "${file}" '.icns')
 
-      if [[ $name != 'code' ]] && [ ! -f "${SRC_PREFIX}src/resources/darwin/$name.icns" ]; then
-        icns2png -x -s 512x512 $file -o .
+      if [[ ${name} != 'code' ]] && [ ! -f "${SRC_PREFIX}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"
+        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"
+        convert "${name}.png" -resize 256x256 "${name}_256.png"
 
-        png2icns "${SRC_PREFIX}src/resources/darwin/$name.icns" "$name.png" "${name}_256.png"
+        png2icns "${SRC_PREFIX}src/resources/darwin/${name}.icns" "${name}.png" "${name}_256.png"
 
-        rm "${name}_512x512x32.png" "$name.png" "${name}_256.png"
+        rm "${name}_512x512x32.png" "${name}.png" "${name}_256.png"
       fi
     fi
   done
@@ -56,17 +56,17 @@ build_darwin_main() {
 }
 
 build_win32() {
-  for file in ${VSCODE_PREFIX}vscode/resources/win32/*.ico
+  for file in "${VSCODE_PREFIX}"vscode/resources/win32/*.ico
   do
-    if [ -f "$file" ]; then
-      name=$(basename $file '.ico')
+    if [ -f "${file}" ]; then
+      name=$(basename "${file}" '.ico')
 
-      if [[ $name != 'code' ]] && [ ! -f "${SRC_PREFIX}src/resources/win32/$name.ico" ]; then
-        icotool -x -w 256 $file
+      if [[ ${name} != 'code' ]] && [ ! -f "${SRC_PREFIX}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_PREFIX}src/resources/win32/$name.ico"
+        convert "${name}.png" -define icon:auto-resize=256,128,96,64,48,32,24,20,16 "${SRC_PREFIX}src/resources/win32/${name}.ico"
 
         rm "${name}_9_256x256x32.png" "${name}.png"
       fi
@@ -144,7 +144,7 @@ build_win32() {
   fi
 }
 
-if [ "$0" == "$BASH_SOURCE" ];
+if [ "${0}" == "${BASH_SOURCE}" ];
 then
   build_darwin_types
   build_win32

patches/binary-name.patch

@@ -1,21 +1,21 @@
 diff --git a/build/gulpfile.vscode.js b/build/gulpfile.vscode.js
-index 2f5a931..ac3d7e6 100644
+index 2686509..4fedec2 100644
 --- a/build/gulpfile.vscode.js
 +++ b/build/gulpfile.vscode.js
-@@ -290,7 +290,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
- 			all = es.merge(all, gulp.src('resources/linux/code.png', { base: '.' }));
+@@ -289,7 +289,7 @@ function packageTask(platform, arch, sourceFolderName, destinationFolderName, op
  		} else if (platform === 'darwin') {
  			const shortcut = gulp.src('resources/darwin/bin/code.sh')
+ 				.pipe(replace('@@APPNAME@@', product.applicationName))
 -				.pipe(rename('bin/code'));
 +				.pipe(rename('bin/' + product.applicationName));
  
  			all = es.merge(all, shortcut);
  		}
 diff --git a/src/vs/platform/native/electron-main/nativeHostMainService.ts b/src/vs/platform/native/electron-main/nativeHostMainService.ts
-index 3bd0c57..d921c60 100644
+index f7bd477..a489ae4 100644
 --- a/src/vs/platform/native/electron-main/nativeHostMainService.ts
 +++ b/src/vs/platform/native/electron-main/nativeHostMainService.ts
-@@ -353,7 +353,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
+@@ -351,7 +351,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
  	}
  
  	private async getShellCommandLink(): Promise<{ readonly source: string; readonly target: string }> {
@@ -24,7 +24,7 @@ index 3bd0c57..d921c60 100644
  		const source = `/usr/local/bin/${this.productService.applicationName}`;
  
  		// Ensure source exists
-@@ -563,7 +563,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
+@@ -545,7 +545,7 @@ export class NativeHostMainService extends Disposable implements INativeHostMain
  
  		// macOS
  		if (this.environmentMainService.isBuilt) {

patches/custom-gallery.patch

@@ -1,17 +1,17 @@
 diff --git a/src/vs/base/common/product.ts b/src/vs/base/common/product.ts
-index 1edc76f..4c0bf98 100644
+index f822373..30a0a66 100644
 --- a/src/vs/base/common/product.ts
 +++ b/src/vs/base/common/product.ts
-@@ -69,6 +69,7 @@ export interface IProductConfiguration {
+@@ -70,6 +70,7 @@ export interface IProductConfiguration {
  
  	readonly extensionsGallery?: {
  		readonly serviceUrl: string;
 +		readonly cacheUrl?: string;
  		readonly itemUrl: string;
+ 		readonly publisherUrl: string;
  		readonly resourceUrlTemplate: string;
- 		readonly controlUrl: string;
 diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
-index e22b33e..98cec93 100644
+index 7e63a16..3bfeab8 100644
 --- a/src/vs/platform/product/common/product.ts
 +++ b/src/vs/platform/product/common/product.ts
 @@ -4,11 +4,12 @@

patches/fix-build-linux.patch

@@ -1,5 +1,31 @@
+diff --git a/build/linux/debian/dependencies-generator.js b/build/linux/debian/dependencies-generator.js
+index 235ca26..4f0f06e 100644
+--- a/build/linux/debian/dependencies-generator.js
++++ b/build/linux/debian/dependencies-generator.js
+@@ -17,7 +17,7 @@ const dep_lists_1 = require("./dep-lists");
+ // If true, we fail the build if there are new dependencies found during that task.
+ // The reference dependencies, which one has to update when the new dependencies
+ // are valid, are in dep-lists.ts
+-const FAIL_BUILD_FOR_NEW_DEPENDENCIES = true;
++const FAIL_BUILD_FOR_NEW_DEPENDENCIES = false;
+ function getDependencies(buildDir, applicationName, arch, sysroot) {
+     // Get the files for which we want to find dependencies.
+     const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
+diff --git a/build/linux/debian/dependencies-generator.ts b/build/linux/debian/dependencies-generator.ts
+index 9e3d466..776a4c2 100644
+--- a/build/linux/debian/dependencies-generator.ts
++++ b/build/linux/debian/dependencies-generator.ts
+@@ -19,7 +19,7 @@ import { ArchString } from './types';
+ // If true, we fail the build if there are new dependencies found during that task.
+ // The reference dependencies, which one has to update when the new dependencies
+ // are valid, are in dep-lists.ts
+-const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = true;
++const FAIL_BUILD_FOR_NEW_DEPENDENCIES: boolean = false;
+ 
+ export function getDependencies(buildDir: string, applicationName: string, arch: ArchString, sysroot: string): string[] {
+ 	// Get the files for which we want to find dependencies.
 diff --git a/build/linux/rpm/dependencies-generator.js b/build/linux/rpm/dependencies-generator.js
-index 1d91eb8..ed6b775 100644
+index 90cfca9..c92579e 100644
 --- a/build/linux/rpm/dependencies-generator.js
 +++ b/build/linux/rpm/dependencies-generator.js
 @@ -16,7 +16,7 @@ const dep_lists_1 = require("./dep-lists");
@@ -12,10 +38,10 @@ index 1d91eb8..ed6b775 100644
      // Get the files for which we want to find dependencies.
      const nativeModulesPath = path.join(buildDir, 'resources', 'app', 'node_modules.asar.unpacked');
 diff --git a/build/linux/rpm/dependencies-generator.ts b/build/linux/rpm/dependencies-generator.ts
-index 95953ec..f5ffc2e 100644
+index 4b84640..55429fb 100644
 --- a/build/linux/rpm/dependencies-generator.ts
 +++ b/build/linux/rpm/dependencies-generator.ts
-@@ -18,7 +18,7 @@ import { ArchString } from './types';
+@@ -16,7 +16,7 @@ import { ArchString } from './types';
  // If true, we fail the build if there are new dependencies found during that task.
  // The reference dependencies, which one has to update when the new dependencies
  // are valid, are in dep-lists.ts
@@ -25,10 +51,10 @@ index 95953ec..f5ffc2e 100644
  export function getDependencies(buildDir: string, applicationName: string, arch: ArchString): string[] {
  	// Get the files for which we want to find dependencies.
 diff --git a/resources/linux/rpm/code.spec.template b/resources/linux/rpm/code.spec.template
-index 5b7eadb..87c914d 100644
+index 00ddb6f..cea0e97 100644
 --- a/resources/linux/rpm/code.spec.template
 +++ b/resources/linux/rpm/code.spec.template
-@@ -74,3 +74,5 @@ update-mime-database /usr/share/mime &> /dev/null || :
+@@ -72,3 +72,5 @@ update-mime-database /usr/share/mime &> /dev/null || :
  /usr/share/pixmaps/@@ICON@@.png
  /usr/share/bash-completion/completions/@@NAME@@
  /usr/share/zsh/site-functions/_@@NAME@@

patches/use-github-extensions.patch

@@ -0,0 +1,12 @@
+diff --git a/build/gulpfile.extensions.js b/build/gulpfile.extensions.js
+--- a/build/gulpfile.extensions.js
++++ b/build/gulpfile.extensions.js
+@@ -223,7 +223,7 @@ const cleanExtensionsBuildTask = task.define('clean-extensions-build', util.rimr
+ const compileExtensionsBuildTask = task.define('compile-extensions-build', task.series(
+ 	cleanExtensionsBuildTask,
+ 	task.define('bundle-extensions-build', () => ext.packageLocalExtensionsStream(false).pipe(gulp.dest('.build'))),
+-	task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false, product.extensionsGallery?.serviceUrl).pipe(gulp.dest('.build'))),
++	task.define('bundle-marketplace-extensions-build', () => ext.packageMarketplaceExtensionsStream(false).pipe(gulp.dest('.build'))),
+ ));
+ 
+ gulp.task(compileExtensionsBuildTask);

prepare_artifacts.sh

@@ -5,10 +5,10 @@ set -e
 npm install -g checksum
 
 sum_file() {
-  if [[ -f "$1" ]]; then
-    echo "Calcuating checksum for $1"
-    checksum -a sha256 "$1" > "$1".sha256
-    checksum "$1" > "$1".sha1
+  if [[ -f "${1}" ]]; then
+    echo "Calcuating checksum for ${1}"
+    checksum -a sha256 "${1}" > "${1}".sha256
+    checksum "${1}" > "${1}".sha1
   fi
 }
 
@@ -18,7 +18,7 @@ if [[ "${OS_NAME}" == "osx" ]]; then
   if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then
     echo "Building and moving ZIP"
     cd "VSCode-darwin-${VSCODE_ARCH}"
-    zip -r -X -y ../artifacts/VSCodium-darwin-${VSCODE_ARCH}-${MS_TAG}.zip ./*.app
+    zip -r -X -y "../artifacts/VSCodium-darwin-${VSCODE_ARCH}-${MS_TAG}.zip" ./*.app
     cd ..
   fi
 
@@ -29,38 +29,42 @@ if [[ "${OS_NAME}" == "osx" ]]; then
     mv "../VSCodium ${MS_TAG}.dmg" "../artifacts/VSCodium.${VSCODE_ARCH}.${MS_TAG}.dmg"
     popd
   fi
+
+  VSCODE_PLATFORM="darwin"
 elif [[ "${OS_NAME}" == "windows" ]]; then
   if [[ "${SHOULD_BUILD_ZIP}" != "no" ]]; then
     echo "Moving ZIP"
-    mv vscode\\.build\\win32-${VSCODE_ARCH}\\archive\\VSCode-win32-${VSCODE_ARCH}.zip artifacts\\VSCodium-win32-${VSCODE_ARCH}-${MS_TAG}.zip
+    mv "vscode\\.build\\win32-${VSCODE_ARCH}\\archive\\VSCode-win32-${VSCODE_ARCH}.zip" "artifacts\\VSCodium-win32-${VSCODE_ARCH}-${MS_TAG}.zip"
   fi
 
   if [[ "${SHOULD_BUILD_EXE_SYS}" != "no" ]]; then
     echo "Moving System EXE"
-    mv vscode\\.build\\win32-${VSCODE_ARCH}\\system-setup\\VSCodeSetup.exe artifacts\\VSCodiumSetup-${VSCODE_ARCH}-${MS_TAG}.exe
+    mv "vscode\\.build\\win32-${VSCODE_ARCH}\\system-setup\\VSCodeSetup.exe" "artifacts\\VSCodiumSetup-${VSCODE_ARCH}-${MS_TAG}.exe"
   fi
 
   if [[ "${SHOULD_BUILD_EXE_USR}" != "no" ]]; then
     echo "Moving User EXE"
-    mv vscode\\.build\\win32-${VSCODE_ARCH}\\user-setup\\VSCodeSetup.exe artifacts\\VSCodiumUserSetup-${VSCODE_ARCH}-${MS_TAG}.exe
+    mv "vscode\\.build\\win32-${VSCODE_ARCH}\\user-setup\\VSCodeSetup.exe" "artifacts\\VSCodiumUserSetup-${VSCODE_ARCH}-${MS_TAG}.exe"
   fi
 
   if [[ "${VSCODE_ARCH}" == "ia32" || "${VSCODE_ARCH}" == "x64" ]]; then
     if [[ "${SHOULD_BUILD_MSI}" != "no" ]]; then
       echo "Moving MSI"
-      mv build\\windows\\msi\\releasedir\\VSCodium-${VSCODE_ARCH}-${MS_TAG}.msi artifacts/
+      mv "build\\windows\\msi\\releasedir\\VSCodium-${VSCODE_ARCH}-${MS_TAG}.msi" artifacts/
     fi
 
     if [[ "${SHOULD_BUILD_MSI_NOUP}" != "no" ]]; then
       echo "Moving MSI with disabled updates"
-      mv build\\windows\\msi\\releasedir\\VSCodium-${VSCODE_ARCH}-updates-disabled-${MS_TAG}.msi artifacts/
+      mv "build\\windows\\msi\\releasedir\\VSCodium-${VSCODE_ARCH}-updates-disabled-${MS_TAG}.msi" artifacts/
     fi
   fi
+
+  VSCODE_PLATFORM="win32"
 else
   if [[ "${SHOULD_BUILD_TAR}" != "no" ]]; then
     echo "Building and moving TAR"
-    cd VSCode-linux-${VSCODE_ARCH}
-    tar czf ../artifacts/VSCodium-linux-${VSCODE_ARCH}-${MS_TAG}.tar.gz .
+    cd "VSCode-linux-${VSCODE_ARCH}"
+    tar czf "../artifacts/VSCodium-linux-${VSCODE_ARCH}-${MS_TAG}.tar.gz" .
     cd ..
   fi
 
@@ -78,6 +82,15 @@ else
     echo "Moving AppImage"
     mv build/linux/appimage/out/*.AppImage* artifacts/
   fi
+
+  VSCODE_PLATFORM="linux"
+fi
+
+if [[ "${SHOULD_BUILD_REH}" != "no" ]]; then
+  echo "Building and moving REH"
+  cd "vscode-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}"
+  tar czf "../artifacts/vscodium-reh-${VSCODE_PLATFORM}-${VSCODE_ARCH}-${MS_TAG}.tar.gz" .
+  cd ..
 fi
 
 cd artifacts

prepare_vscode.sh

@@ -5,7 +5,7 @@ set -e
 cp -rp src/* vscode/
 cp -f LICENSE vscode/LICENSE.txt
 
-cd vscode || exit
+cd vscode || { echo "'vscode' dir not found"; exit 1; }
 
 ../update_settings.sh
 
@@ -13,30 +13,40 @@ cd vscode || exit
 { set +x; } 2>/dev/null
 
 for file in ../patches/*.patch; do
-  if [ -f "$file" ]; then
-    echo applying patch: $file;
-    git apply --ignore-whitespace "$file"
+  if [ -f "${file}" ]; then
+    echo applying patch: "${file}";
+    git apply --ignore-whitespace "${file}"
     if [ $? -ne 0 ]; then
-      echo failed to apply patch $file 1>&2
+      echo failed to apply patch "${file}" 1>&2
     fi
   fi
 done
 
 for file in ../patches/user/*.patch; do
-  if [ -f "$file" ]; then
-    echo applying user patch: $file;
-    git apply --ignore-whitespace "$file"
+  if [ -f "${file}" ]; then
+    echo applying user patch: "${file}";
+    git apply --ignore-whitespace "${file}"
     if [ $? -ne 0 ]; then
-      echo failed to apply patch $file 1>&2
+      echo failed to apply patch "${file}" 1>&2
     fi
   fi
 done
 
 set -x
 
-if [[ "$OS_NAME" == "osx" ]]; then
-  CHILD_CONCURRENCY=1 yarn --frozen-lockfile --ignore-optional
-  npm_config_argv='{"original":["--ignore-optional"]}' yarn postinstall
+if [[ "${OS_NAME}" == "osx" ]]; then
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile
+  yarn postinstall
+elif [[ "${npm_config_arch}" == "armv7l" || "${npm_config_arch}" == "ia32" ]]; then
+  # node-gyp@9.0.0 shipped with node@16.15.0 starts using config.gypi
+  # from the custom headers path if dist-url option was set instead of
+  # using the config value from the process. Electron builds with pointer compression
+  # enabled for x64 and arm64, but incorrectly ships a single copy of config.gypi
+  # with v8_enable_pointer_compression option always set for all target architectures.
+  # We use the force_process_config option to use the config.gypi from the
+  # nodejs process executing npm for 32-bit architectures.
+  export npm_config_force_process_config="true"
+  CHILD_CONCURRENCY=1 yarn --frozen-lockfile
 else
   CHILD_CONCURRENCY=1 yarn --frozen-lockfile
 fi
@@ -70,11 +80,12 @@ win32AppUserModelId='setpath(["win32AppUserModelId"]; "Microsoft.VSCodium")'
 win32ShellNameShort='setpath(["win32ShellNameShort"]; "VSCodium")'
 win32x64UserAppId='setpath (["win32x64UserAppId"]; "{{2E1F05D1-C245-4562-81EE-28188DB6FD17}")'
 urlProtocol='setpath(["urlProtocol"]; "vscodium")'
-serverDataFolderName='setpath(["serverDataFolderName"]; ".vscode-server-oss")'
+serverApplicationName='setpath(["serverApplicationName"]; "codium-server")'
+serverDataFolderName='setpath(["serverDataFolderName"]; ".vscodium-server")'
 reportIssueUrl='setpath(["reportIssueUrl"]; "https://github.com/VSCodium/vscodium/issues/new")'
 licenseUrl='setpath(["licenseUrl"]; "https://github.com/VSCodium/vscodium/blob/master/LICENSE")'
 
-product_json_changes="${checksumFailMoreInfoUrl} | ${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${linkProtectionTrustedDomains} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${serverDataFolderName} | ${reportIssueUrl} | ${licenseUrl}"
+product_json_changes="${checksumFailMoreInfoUrl} | ${tipsAndTricksUrl} | ${twitterUrl} | ${requestFeatureUrl} | ${documentationUrl} | ${introductoryVideosUrl} | ${updateUrl} | ${releaseNotesUrl} | ${keyboardShortcutsUrlMac} | ${keyboardShortcutsUrlLinux} | ${keyboardShortcutsUrlWin} | ${quality} | ${extensionsGallery} | ${linkProtectionTrustedDomains} | ${nameShort} | ${nameLong} | ${linuxIconName} | ${applicationName} | ${win32MutexName} | ${win32DirName} | ${win32NameVersion} | ${win32RegValueName} | ${win32AppUserModelId} | ${win32ShellNameShort} | ${win32x64UserAppId} | ${urlProtocol} | ${serverApplicationName} | ${serverDataFolderName} | ${reportIssueUrl} | ${licenseUrl}"
 cat product.json.bak | jq "${product_json_changes}" > product.json.tmp
 
 jq -s '.[0] * .[1]' product.json.tmp ../product.json > product.json
@@ -84,7 +95,7 @@ cat product.json
 
 ../undo_telemetry.sh
 
-if [[ "$OS_NAME" == "linux" ]]; then
+if [[ "${OS_NAME}" == "linux" ]]; then
   # microsoft adds their apt repo to sources
   # unless the app name is code-oss
   # as we are renaming the application to vscodium

product.json

@@ -51,7 +51,8 @@
       "testObserver"
     ],
     "VisualStudioExptTeam.vscodeintellicode-completions": [
-      "inlineCompletions"
+      "inlineCompletionsNew",
+      "inlineCompletionsAdditions"
     ],
     "ms-vsliveshare.vsliveshare": [
       "contribMenuBarHome",
@@ -61,13 +62,12 @@
       "findTextInFiles",
       "notebookCellExecutionState",
       "notebookContentProvider",
-      "notebookDocumentEvents",
       "notebookEditor",
       "notebookEditorEdit",
       "notebookLiveShare",
+      "notebookWorkspaceEdit",
       "terminalDimensions",
       "terminalDataWriteEvent",
-      "textDocumentNotebook",
       "textSearchProvider"
     ],
     "ms-vscode.js-debug": [
@@ -82,25 +82,20 @@
     ],
     "ms-python.python": [
       "quickPickSortByLabel",
-      "testObserver",
-      "notebookEditor"
+      "testObserver"
     ],
     "ms-dotnettools.dotnet-interactive-vscode": [
-      "notebookConcatTextDocument",
-      "notebookContentProvider",
       "notebookCellExecutionState",
       "notebookControllerKind",
       "notebookDebugOptions",
-      "notebookDeprecated",
       "notebookEditor",
-      "notebookEditorDecorationType",
-      "notebookEditorEdit",
       "notebookLiveShare",
       "notebookMessaging",
       "notebookMime",
-      "textDocumentNotebook"
+      "notebookWorkspaceEdit"
     ],
     "GitHub.codespaces": [
+      "contribEditSessions",
       "contribMenuBarHome",
       "contribRemoteHelp",
       "contribViewsRemote",
@@ -112,10 +107,10 @@
     "ms-vscode.azure-repos": [
       "extensionRuntime",
       "fileSearchProvider",
-      "resolvers",
       "textSearchProvider"
     ],
     "ms-vscode.remote-repositories": [
+      "contribEditSessions",
       "contribRemoteHelp",
       "contribMenuBarHome",
       "contribViewsRemote",
@@ -128,14 +123,7 @@
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
-      "timeline",
-      "notebookEditor"
-    ],
-    "ms-vscode.vscode-github-issue-notebooks": [
-      "notebookEditor"
-    ],
-    "tanhakabir.rest-book": [
-      "notebookEditor"
+      "timeline"
     ],
     "ms-vscode-remote.remote-wsl": [
       "resolvers",
@@ -148,6 +136,10 @@
       "contribViewsRemote",
       "telemetry"
     ],
+    "ms-vscode.remote-server": [
+      "resolvers",
+      "contribViewsRemote"
+    ],
     "ms-vscode-remote.remote-containers": [
       "resolvers",
       "workspaceTrust",
@@ -164,15 +156,18 @@
       "documentFiltersExclusive"
     ],
     "GitHub.vscode-pull-request-github": [
-      "tokenInformation"
+      "tokenInformation",
+      "commentsResolvedState",
+      "badges",
+      "contribViewSize"
     ],
     "GitHub.copilot": [
-      "inlineCompletions",
-      "textDocumentNotebook"
+      "inlineCompletionsNew",
+      "inlineCompletionsAdditions"
     ],
     "GitHub.copilot-nightly": [
-      "inlineCompletions",
-      "textDocumentNotebook"
+      "inlineCompletionsNew",
+      "inlineCompletionsAdditions"
     ],
     "GitHub.remotehub": [
       "contribRemoteHelp",
@@ -184,12 +179,10 @@
       "fileSearchProvider",
       "quickPickSortByLabel",
       "workspaceTrust",
-      "resolvers",
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
-      "timeline",
-      "notebookEditor"
+      "timeline"
     ],
     "GitHub.remotehub-insiders": [
       "contribRemoteHelp",
@@ -201,42 +194,35 @@
       "fileSearchProvider",
       "quickPickSortByLabel",
       "workspaceTrust",
-      "resolvers",
       "scmSelectedProvider",
       "scmValidation",
       "textSearchProvider",
-      "timeline",
-      "notebookEditor"
+      "timeline"
     ],
     "ms-python.gather": [
-      "notebookEditor",
       "notebookCellExecutionState"
     ],
     "ms-python.vscode-pylance": [
-      "notebookDocumentEvents",
       "notebookEditor",
       "notebookCellExecutionState"
     ],
     "ms-toolsai.jupyter": [
-      "notebookConcatTextDocument",
       "notebookControllerKind",
       "notebookDebugOptions",
       "notebookDeprecated",
-      "notebookEditor",
-      "notebookDocumentEvents",
-      "notebookEditorDecorationType",
-      "notebookEditorEdit",
+      "notebookWorkspaceEdit",
       "notebookMessaging",
       "notebookMime",
       "notebookCellExecutionState",
       "portsAttributes",
-      "textDocumentNotebook",
-      "quickPickSortByLabel"
+      "quickPickSortByLabel",
+      "notebookKernelSource",
+      "interactiveWindow"
+    ],
+    "ms-toolsai.vscode-jupyter-powertoys": [
+      "notebookWorkspaceEdit"
     ],
     "dbaeumer.vscode-eslint": [
-      "tabs",
-      "notebookDocumentEvents",
-      "notebookEditor",
       "notebookCellExecutionState"
     ],
     "ms-vscode.azure-sphere-tools-ui": [
@@ -244,6 +230,12 @@
     ],
     "ms-azuretools.vscode-azureappservice": [
       "terminalDataWriteEvent"
+    ],
+    "ms-vscode.anycode": [
+      "extensionsAny"
+    ],
+    "ms-vscode.cpptools": [
+      "terminalDataWriteEvent"
     ]
   },
   "extensionKind": {

release.sh

@@ -33,9 +33,9 @@ do
     gh release upload "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
 
     EXIT_STATUS=$?
-    echo "exit: $EXIT_STATUS"
+    echo "exit: ${EXIT_STATUS}"
 
-    if (( $EXIT_STATUS )); then
+    if (( "${EXIT_STATUS}" )); then
       for (( i=0; i<10; i++ ))
       do
         github-release delete --owner "${OWNER}" --repo "${REPOSITORY}" --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
@@ -46,15 +46,15 @@ do
         gh release upload "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"
 
         EXIT_STATUS=$?
-        echo "exit: $EXIT_STATUS"
+        echo "exit: ${EXIT_STATUS}"
 
-        if ! (( $EXIT_STATUS )); then
+        if ! (( "${EXIT_STATUS}" )); then
           break
         fi
       done
-      echo "exit: $EXIT_STATUS"
+      echo "exit: ${EXIT_STATUS}"
 
-      if (( $EXIT_STATUS )); then
+      if (( "${EXIT_STATUS}" )); then
         echo "'${FILE}' hasn't been uploaded!"
 
         github-release delete --owner "${OWNER}" --repo "${REPOSITORY}" --tag "${MS_TAG}" "${FILE}" "${FILE}.sha1" "${FILE}.sha256"

stores/snapcraft/check_version.sh

@@ -15,11 +15,9 @@ else
 
   sudo snap install --channel stable --classic snapcraft
 
-  echo "$SNAP_STORE_LOGIN" | snapcraft login --with -
-
   echo "Architecture: ${ARCHITECTURE}"
 
-  SNAP_VERSION=$(snapcraft list-revisions codium | grep -F stable* | grep ${ARCHITECTURE} | tr -s ' ' | cut -d ' ' -f 4)
+  SNAP_VERSION=$(snapcraft list-revisions codium | grep -F "stable*" | grep "${ARCHITECTURE}" | tr -s ' ' | cut -d ' ' -f 4)
   echo "Snap version: ${SNAP_VERSION}"
 
   wget --quiet https://api.github.com/repos/VSCodium/vscodium/releases -O gh_latest.json
@@ -38,6 +36,6 @@ else
   fi
 fi
 
-if [[ $GITHUB_ENV ]]; then
-	echo "SHOULD_DEPLOY=$SHOULD_DEPLOY" >> $GITHUB_ENV
+if [[ "${GITHUB_ENV}" ]]; then
+	echo "SHOULD_DEPLOY=${SHOULD_DEPLOY}" >> "${GITHUB_ENV}"
 fi

undo_telemetry.sh

@@ -1,17 +1,44 @@
-# mobile.events.data.microsoft.com
-# vortex.data.microsoft.com
-TELEMETRY_URLS="[^/]+\.data\.microsoft\.com"
-REPLACEMENT="s/$TELEMETRY_URLS/0\.0\.0\.0/g"
+#!/bin/bash
 
-#include common functions
+set -ex
+
+# list of urls to match:
+# - mobile.events.data.microsoft.com
+# - vortex.data.microsoft.com
+
+SEARCH="\.data\.microsoft\.com"
+REPLACEMENT="s|//[^/]+\.data\.microsoft\.com|//0\.0\.0\.0|g"
+
+# include common functions
 . ../utils.sh
 
-if [[ "$OS_NAME" == "osx" ]]; then
-  if is_gnu_sed; then
-    grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i -E $REPLACEMENT
-  else
-    grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i '' -E $REPLACEMENT
-  fi
+if is_gnu_sed; then
+  replace_with_debug () {
+    echo "found: ${2} (`date`)"
+    sed -i -E "${1}" "${2}"
+  }
 else
-  grep -rl --exclude-dir=.git -E $TELEMETRY_URLS . | xargs sed -i -E $REPLACEMENT
+  replace_with_debug () {
+    echo "found: ${2} (`date`)"
+    sed -i '' -E "${1}" "${2}"
+  }
 fi
+export -f replace_with_debug
+
+d1=`date +%s`
+
+if [[ "${OS_NAME}" == "linux" ]]; then
+  if [[ ${VSCODE_ARCH} == "x64" ]]; then
+    rg --no-ignore -l "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}"
+  else
+    grep -rl --exclude-dir=.git -E "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}"
+  fi
+elif [[ "${OS_NAME}" == "osx" ]]; then
+  ./node_modules/@vscode/ripgrep/bin/rg --no-ignore -l "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}"
+else
+  ./node_modules/@vscode/ripgrep/bin/rg --no-ignore --path-separator=// -l "${SEARCH}" . | xargs -I {} bash -c 'replace_with_debug "${1}" "{}"' _ "${REPLACEMENT}"
+fi
+
+d2=`date +%s`
+
+echo "undo_telemetry: $( echo $((${d2} - ${d1})) )s"

update_settings.sh

@@ -9,41 +9,41 @@ TELEMETRY_CONFIGURATION=" TelemetryConfiguration.ON"
 . ../utils.sh
 
 update_setting () {
-  local FILENAME="$2"
+  local FILENAME="${2}"
   # check that the file exists
-  if [ ! -f $FILENAME ]; then
+  if [ ! -f "${FILENAME}" ]; then
     echo "File to update setting in does not exist ${FILENAME}"
     return
   fi
 
   # go through lines of file, looking for block that contains setting
-  local SETTING="$1"
+  local SETTING="${1}"
   local LINE_NUM=0
   while read -r line; do
     local LINE_NUM=$(( $LINE_NUM + 1 ))
-    if [[ $line == *"$SETTING"* ]]; then
+    if [[ "${line}" == *"${SETTING}"* ]]; then
       local IN_SETTING=1
     fi
-    if [[ ($line == *"$DEFAULT_TRUE"* || $line == *"$DEFAULT_ON"*) && "$IN_SETTING" == "1" ]]; then
+    if [[ ("${line}" == *"${DEFAULT_TRUE}"* || "${line}" == *"${DEFAULT_ON}"*) && "${IN_SETTING}" == "1" ]]; then
       local FOUND=1
       break
     fi
-  done < $FILENAME
+  done < "${FILENAME}"
 
-  if [[ "$FOUND" != "1" ]]; then
-    echo "$DEFAULT_TRUE not found for setting $SETTING in file $FILENAME"
+  if [[ "${FOUND}" != "1" ]]; then
+    echo "${DEFAULT_TRUE} not found for setting ${SETTING} in file ${FILENAME}"
     return
   fi
 
   # construct line-aware replacement string
-  if [[ $line == *"$DEFAULT_TRUE"* ]]; then
+  if [[ "${line}" == *"${DEFAULT_TRUE}"* ]]; then
     local DEFAULT_TRUE_TO_FALSE="${LINE_NUM}s/${DEFAULT_TRUE}/${DEFAULT_FALSE}/"
   else
     local DEFAULT_TRUE_TO_FALSE="${LINE_NUM}s/${DEFAULT_ON}/${DEFAULT_OFF}/"
   fi
 
-  replace "$DEFAULT_TRUE_TO_FALSE" $FILENAME
+  replace "${DEFAULT_TRUE_TO_FALSE}" "${FILENAME}"
 }
 
-update_setting "$TELEMETRY_CRASH_REPORTER" src/vs/workbench/electron-sandbox/desktop.contribution.ts
-update_setting "$TELEMETRY_CONFIGURATION" src/vs/platform/telemetry/common/telemetryService.ts
+update_setting "${TELEMETRY_CRASH_REPORTER}" src/vs/workbench/electron-sandbox/desktop.contribution.ts
+update_setting "${TELEMETRY_CONFIGURATION}" src/vs/platform/telemetry/common/telemetryService.ts

utils.sh

@@ -7,10 +7,10 @@ is_gnu_sed () {
 }
 
 replace () {
-  echo $1
+  echo "${1}"
   if is_gnu_sed; then
-    sed -i -E "$1" $2
+    sed -i -E "${1}" "${2}"
   else
-    sed -i '' -E "$1" $2
+    sed -i '' -E "${1}" "${2}"
   fi
 }