Merge pull request #29 from aws/04-17-script-update

Added postinstall script and updated script handling

Author: aws-pangestu

README.md

@@ -16,6 +16,7 @@ This script will:
 - use `quilt` to pop any existing patches.
 - update the submodule to verify the local version is in parity with source
 - apply all patches with `quilt` from `./patches`
+- runs `./scripts/postinstall.sh` that will comment out 2 breaking `git config` lines from `./vscode/build/npm/postinstall.js`
 - runs `./scripts/copy-resource.sh` that will copy patched version of code - oss from `./vscode` into `./patched-vscode` folder along with icon(s) and svg(s) from `./resources` folder
 - runs `yarn install` and downloads built in extensions on patched submodule
 

scripts/copy-resources.sh

@@ -3,11 +3,14 @@
 # Exit immediately if a command exits with a non-zero status.
 set -ex
 
+# Set current project root
+PROJ_ROOT=$(pwd)
+
 # Define the source directory for the resources
-SOURCE_DIR="resources"
+SOURCE_DIR="${PROJ_ROOT}/resources"
 
 # Define the destination base directory
-DEST_DIR="vscode"
+DEST_DIR="${PROJ_ROOT}/vscode"
 
 # Define paths for each file relative to the base directories
 # Format: "source_file_path:destination_file_path"

scripts/install.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
-set -e
+
+# set +e to prevent quilt from exiting when no patches popped
+set +e
 
 # Set current project root
 PROJ_ROOT=$(pwd)
@@ -8,6 +10,9 @@ PROJ_ROOT=$(pwd)
 printf "\n======== Cleaning out patches ========\n"
 quilt pop -a
 
+# re-enable -e to allow exiting on error
+set -e
+
 # make sure module is current
 printf "\n======== Updating submodule ========\n"
 git submodule update --init
@@ -22,10 +27,18 @@ printf "\n======== Applying patches ========\n"
         exit 1
 }
 
+# Comment out breaking lines in postinstall.js
+printf "\n======== Comment out breaking git config lines in postinstall.js ========\n"
+sh ${PROJ_ROOT}/scripts/postinstall.sh
+
 # Copy resources
 printf "\n======== Copy resources ========\n"
 sh ${PROJ_ROOT}/scripts/copy-resources.sh
 
+# Delete node_modules to prevent node-gyp build error
+printf "\n======== Deleting vscode/node_modules ========\n"
+rm -rf "${PROJ_ROOT}/vscode/node_modules"
+
 # Build the project
 printf "\n======== Building project in ${PROJ_ROOT}/vscode ========\n"
 yarn --cwd "${PROJ_ROOT}/vscode" install --pure-lockfile --verbose

scripts/postinstall.sh

@@ -0,0 +1,22 @@
+#!/bin/bash
+
+# Exit immediately if a command exits with a non-zero status.
+set -ex
+
+# Set current project root
+PROJ_ROOT=$(pwd)
+
+# Define the destination base directory
+POSTINSTALL_JS_PATH="${PROJ_ROOT}/vscode/build/npm/postinstall.js"
+
+# Check if the postinstall.js file exists
+if [ ! -f "$POSTINSTALL_JS_PATH" ]; then
+    echo "Error: $POSTINSTALL_JS_PATH does not exist." >&2
+    exit 1
+fi
+
+# Use sed to comment out the specific lines
+sed -i '' '/cp\.execSync('"'"'git config pull\.rebase merges'"'"');/s/^/\/\/ /' "$POSTINSTALL_JS_PATH"
+sed -i '' '/cp\.execSync('"'"'git config blame\.ignoreRevsFile \.git-blame-ignore'"'"');/s/^/\/\/ /' "$POSTINSTALL_JS_PATH"
+
+echo "Specified git config lines have been commented out in $POSTINSTALL_JS_PATH."