Преглед изворни кода

fix: personalize global policy file (#2638)

Baptiste Augrain пре 3 дана
родитељ
комит
de5bd6bf1f
3 измењених фајлова са 17 додато и 0 уклоњено
  1. 9 0
      patches/linux/fix-global-policy.patch
  2. 2 0
      prepare_vscode.sh
  3. 6 0
      utils.sh

+ 9 - 0
patches/linux/fix-global-policy.patch

@@ -0,0 +1,9 @@
+diff --git a/src/vs/base/common/policy.ts b/src/vs/base/common/policy.ts
+index 8141b0f..33599d9 100644
+--- a/src/vs/base/common/policy.ts
++++ b/src/vs/base/common/policy.ts
+@@ -11,3 +11,3 @@ import { IDefaultAccount } from './defaultAccount.js';
+  */
+-export const LINUX_SYSTEM_POLICY_FILE_PATH = '/etc/vscode/policy.json';
++export const LINUX_SYSTEM_POLICY_FILE_PATH = '/etc/!!GLOBAL_DIRNAME!!/policy.json';
+ 

+ 2 - 0
prepare_vscode.sh

@@ -132,8 +132,10 @@ cat product.json
 
 echo "APP_NAME=\"${APP_NAME}\""
 echo "APP_NAME_LC=\"${APP_NAME_LC}\""
+echo "ASSETS_REPOSITORY=\"${ASSETS_REPOSITORY}\""
 echo "BINARY_NAME=\"${BINARY_NAME}\""
 echo "GH_REPO_PATH=\"${GH_REPO_PATH}\""
+echo "GLOBAL_DIRNAME=\"${GLOBAL_DIRNAME}\""
 echo "ORG_NAME=\"${ORG_NAME}\""
 echo "TUNNEL_APP_NAME=\"${TUNNEL_APP_NAME}\""
 

+ 6 - 0
utils.sh

@@ -8,6 +8,12 @@ GH_REPO_PATH="${GH_REPO_PATH:-VSCodium/vscodium}"
 ORG_NAME="${ORG_NAME:-VSCodium}"
 TUNNEL_APP_NAME="${TUNNEL_APP_NAME:-"${BINARY_NAME}-tunnel"}"
 
+if [[ "${VSCODE_QUALITY}" == "insider" ]]; then
+  GLOBAL_DIRNAME="${GLOBAL_DIRNAME:-"${APP_NAME_LC}"}-insiders"
+else
+  GLOBAL_DIRNAME="${GLOBAL_DIRNAME:-"${APP_NAME_LC}"}"
+fi
+
 # All common functions can be added to this file
 
 apply_patch() {