From a5506b975cab63d6ccdc9d4b8c55b834a7891514 Mon Sep 17 00:00:00 2001
From: Baptiste Augrain <daiyam@zokugun.org>
Date: Mon, 23 Aug 2021 05:05:01 +0200
Subject: [PATCH] add some small improvements (#803)

---
 .gitignore              |  3 +++
 build/build_windows.ps1 |  3 ++-
 build/build_windows.sh  | 10 ++++++++++
 docs/build.md           |  4 ++--
 prepare_vscode.sh       |  4 ++++
 5 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100755 build/build_windows.sh

diff --git a/.gitignore b/.gitignore
index c951143..d3953fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
 vscode
 VS*/*
 .DS_Store
+out
+pkg2appimage-*.AppImage
+pkg2appimage.AppDir
diff --git a/build/build_windows.ps1 b/build/build_windows.ps1
index c0a80e7..963819a 100755
--- a/build/build_windows.ps1
+++ b/build/build_windows.ps1
@@ -1,6 +1,7 @@
 # powershell -ExecutionPolicy ByPass -File .\build\build_windows.ps1
 
-$env:Path += ";C:\Program Files\Git\bin"
+# first so `bash` is the one installed with `git`, avoid conflict with WSL
+$env:Path = "C:\Program Files\Git\bin;" + $env:Path
 
 Remove-Item -Recurse -Force VSCode*
 
diff --git a/build/build_windows.sh b/build/build_windows.sh
new file mode 100755
index 0000000..c6e2533
--- /dev/null
+++ b/build/build_windows.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# to run with WSL: wsl ./build/build_windows.sh
+
+rm -rf VSCode*
+rm -rf vscode
+
+./get_repo.sh
+
+SHOULD_BUILD=yes CI_BUILD=no OS_NAME=windows VSCODE_ARCH=x64 ./build.sh
diff --git a/docs/build.md b/docs/build.md
index 5d6589d..d0c8f2a 100644
--- a/docs/build.md
+++ b/docs/build.md
@@ -14,6 +14,7 @@
 - node 14
 - yarn
 - jq
+- git
 
 ### <a id="dependencies-linux"></a>Linux
 
@@ -30,7 +31,6 @@
 ### <a id="dependencies-windows"></a>Windows
 
 - powershell
-- git
 - sed
 
 ## <a id="build-scripts"></a>Build Scripts
@@ -38,7 +38,7 @@
 Each platform has its build helper script in the directory `build`.
 
 - Linux: `./build/build_linux.sh`
-- MacOS: `./build/build_macos_.sh`
+- MacOS: `./build/build_macos.sh`
 - Windows: `powershell -ExecutionPolicy ByPass -File .\build\build_windows.ps1`
 
 ## <a id="build-docker"></a>Build in Docker
diff --git a/prepare_vscode.sh b/prepare_vscode.sh
index b1e951b..3edbcaa 100755
--- a/prepare_vscode.sh
+++ b/prepare_vscode.sh
@@ -8,6 +8,8 @@ cd vscode || exit
 ../update_settings.sh
 
 # apply patches
+{ set +x; } 2>/dev/null
+
 for file in ../patches/*.patch; do
   if [ -f "$file" ]; then
     echo applying patch: $file;
@@ -28,6 +30,8 @@ for file in ../patches/user/*.patch; do
   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