refactor: patches (#2797)

dev/patch.sh

@@ -30,19 +30,63 @@ normalize_file "${1}"
 if [[ "${FILE}" != "../patches/helper/settings.patch" ]]; then
   git apply --reject "../patches/helper/settings.patch"
 
-  while [ $# -gt 1 ]; do
-    echo "Parameter: $1"
+  if [[ $# -gt 1 ]]; then
+    while [ $# -gt 1 ]; do
+      echo "Parameter: $1"
+      normalize_file "${1}"
+
+      git apply --reject "${FILE}"
+
+      shift
+    done
+
+    git add .
+    git commit --no-verify -q -m "VSCODIUM HELPER"
+
+    normalize_file "${1}"
+  else
     normalize_file "${1}"
 
-    git apply --reject "${FILE}"
+    BASENAME=$(basename "${FILE}")
+    DIRNAME=$(dirname "${FILE}")
 
-    shift
-  done
+    if [[ "${BASENAME}" =~ ^([0-9])([1-9])(-.*)\.patch$ ]]; then
+      GROUP_ID="${BASH_REMATCH[1]}"
+      INDEX="${BASH_REMATCH[2]}"
+      ENDNAME="${BASH_REMATCH[3]}"
 
-  git add .
-  git commit --no-verify -q -m "VSCODIUM HELPER"
+      for ((I = 0; I < INDEX; I++)); do
+        NOT_FOUND=1
 
-  normalize_file "${1}"
+        for CANDIDATE in "${DIRNAME}/${GROUP_ID}${I}-"*.patch; do
+          if [[ -f "$CANDIDATE" ]]; then
+            echo "Candidate: ${CANDIDATE}"
+            normalize_file "${CANDIDATE}"
+
+            git apply --reject "${FILE}"
+
+            NOT_FOUND=0
+          fi
+        done
+
+        if (( $NOT_FOUND )); then
+          for CANDIDATE in "${DIRNAME}/../${GROUP_ID}${I}-"*.patch; do
+            if [[ -f "$CANDIDATE" ]]; then
+              echo "Candidate: ${CANDIDATE}"
+              normalize_file "${CANDIDATE}"
+
+              git apply --reject "${FILE}"
+            fi
+          done
+        fi
+      done
+
+      git add .
+      git commit --no-verify -q -m "VSCODIUM HELPER"
+
+      normalize_file "${1}"
+    fi
+  fi
 fi
 
 echo "FILE: ${FILE}"

dev/update_patches.sh

@@ -119,6 +119,7 @@ check_file() {
       fi
 
       while [[ -n "$( find . -name '*.rej' -print )" ]]; do
+        echo "patch: ${1}"
         find . -name '*.rej' -print
         read -rp "Press any key when the conflict have been resolved..." -n1 -s
         echo
@@ -144,8 +145,26 @@ while [[ -n "$( git log -1 | grep "VSCODIUM HELPER" )" ]]; do
 done
 
 for FILE in ../patches/*.patch; do
-  if [[ "${FILE}" == *"/fix-policies.patch" ]]; then
-    check_file "../patches/fix-keymap.patch" "../patches/fix-policies.patch"
+  ADDITIONAL_FILES=()
+  BASENAME=$(basename "${FILE}")
+  DIRNAME=$(dirname "${FILE}")
+
+  if [[ "${BASENAME}" =~ ^([0-9])([1-9])(-.*)\.patch$ ]]; then
+    GROUP_ID="${BASH_REMATCH[1]}"
+    INDEX="${BASH_REMATCH[2]}"
+    ENDNAME="${BASH_REMATCH[3]}"
+
+    for ((I = 0; I < INDEX; I++)); do
+      for CANDIDATE in "${DIRNAME}/${GROUP_ID}${I}-"*.patch; do
+        if [[ -f "$CANDIDATE" ]]; then
+          ADDITIONAL_FILES+=("$CANDIDATE")
+        fi
+      done
+    done
+  fi
+
+  if [[ ${#ADDITIONAL_FILES[@]} -gt 0 ]]; then
+    check_file ${ADDITIONAL_FILES[@]} "${FILE}"
   else
     check_file "${FILE}"
   fi
@@ -159,25 +178,44 @@ fi
 
 for ARCH in alpine linux osx windows; do
   for FILE in "../patches/${ARCH}/"*.patch; do
-    if [[ "${ARCH}" == "linux" && "${FILE}" == *"/arch-"* ]] || [[ "${ARCH}" == "linux" && "${FILE}" == *"/fix-dependencies.patch" ]] || [[ "${ARCH}" == "windows" && "${FILE}" == *"/cli"* ]]; then
-      echo "skip ${FILE}"
+    ADDITIONAL_FILES=()
+    BASENAME=$(basename "${FILE}")
+    DIRNAME=$(dirname "${FILE}")
+
+    if [[ "${BASENAME}" =~ ^([0-9])([1-9])(-.*)\.patch$ ]]; then
+      GROUP_ID="${BASH_REMATCH[1]}"
+      INDEX="${BASH_REMATCH[2]}"
+      ENDNAME="${BASH_REMATCH[3]}"
+
+      for ((I = 0; I < INDEX; I++)); do
+        NOT_FOUND=1
+
+        for CANDIDATE in "${DIRNAME}/${GROUP_ID}${I}-"*.patch; do
+          if [[ -f "$CANDIDATE" ]]; then
+            ADDITIONAL_FILES+=("$CANDIDATE")
+            NOT_FOUND=0
+          fi
+        done
+
+        if (( $NOT_FOUND )); then
+          for CANDIDATE in "${DIRNAME}/../${GROUP_ID}${I}-"*.patch; do
+            if [[ -f "$CANDIDATE" ]]; then
+              ADDITIONAL_FILES+=("$CANDIDATE")
+            fi
+          done
+        fi
+      done
+
+      if [[ ${#ADDITIONAL_FILES[@]} -gt 0 ]]; then
+        check_file ${ADDITIONAL_FILES[@]} "${FILE}"
+      else
+        check_file "${FILE}"
+      fi
     else
       check_file "${FILE}"
     fi
   done
 
-  if [[ "${ARCH}" == "linux" ]]; then
-    check_file "../patches/optional-tree-sitter.patch" "../patches/linux/fix-dependencies.patch"
-
-    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch"
-    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch"
-    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch"
-    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch"
-    check_file "../patches/cli.patch" "../patches/linux/arch-0-support.patch" "../patches/linux/arch-1-ppc64le.patch" "../patches/linux/arch-2-riscv64.patch" "../patches/linux/arch-3-loong64.patch" "../patches/linux/arch-4-s390x.patch"
-  elif [[ "${ARCH}" == "windows" ]]; then
-    check_file "../patches/cli.patch" "../patches/windows/cli.patch"
-  fi
-
   for TARGET in client reh; do
     for FILE in "../patches/${ARCH}/${TARGET}/"*.patch; do
       check_file "${FILE}"

patches/osx/fix-codesign.patch.no

@@ -1,30 +0,0 @@
-diff --git a/build/darwin/sign.js b/build/darwin/sign.js
-index dff30fd..df48bee 100644
---- a/build/darwin/sign.js
-+++ b/build/darwin/sign.js
-@@ -56,5 +56,7 @@ async function main(buildDir) {
-         ignore: (filePath) => {
-+            const ext = path_1.default.extname(filePath);
-             return filePath.includes(gpuHelperAppName) ||
-                 filePath.includes(rendererHelperAppName) ||
--                filePath.includes(pluginHelperAppName);
-+                filePath.includes(pluginHelperAppName) ||
-+                ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
-         }
-diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
-index ecf1627..a414032 100644
---- a/build/darwin/sign.ts
-+++ b/build/darwin/sign.ts
-@@ -60,6 +60,9 @@ async function main(buildDir?: string): Promise<void> {
- 		ignore: (filePath: string) => {
--			return filePath.includes(gpuHelperAppName) ||
--				filePath.includes(rendererHelperAppName) ||
--				filePath.includes(pluginHelperAppName);
-+			const ext = path.extname(filePath);
-+            return filePath.includes(gpuHelperAppName) ||
-+                filePath.includes(rendererHelperAppName) ||
-+                filePath.includes(pluginHelperAppName) ||
-+				ext == '.asar' || ext == '.dat' || ext == '.gif' || ext == '.icns' || ext == '.ico' || ext == '.json' || ext == '.mp3' || ext == '.nib' || ext == '.pak' || ext == '.png' || ext == '.scpt' || ext == '.ttf' || ext == '.wasm' || ext == '.woff' || ext == '.woff2';
- 		}
-+
- 	};

prepare_vscode.sh

@@ -146,7 +146,7 @@ echo "ORG_NAME=\"${ORG_NAME}\""
 echo "TUNNEL_APP_NAME=\"${TUNNEL_APP_NAME}\""
 
 if [[ "${DISABLE_UPDATE}" == "yes" ]]; then
-  mv ../patches/disable-update.patch.yet ../patches/disable-update.patch
+  mv ../patches/00-update-disable.patch.yet ../patches/00-update-disable.patch
 fi
 
 for file in ../patches/*.patch; do