diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/git-auth-helper.ts | 6 | ||||
| -rwxr-xr-x | src/misc/licensed-check.sh | 2 | ||||
| -rwxr-xr-x | src/misc/licensed-download.sh | 14 | ||||
| -rwxr-xr-x | src/misc/licensed-generate.sh | 2 |
4 files changed, 13 insertions, 11 deletions
diff --git a/src/git-auth-helper.ts b/src/git-auth-helper.ts index 8a1c7c3..400b1ac 100644 --- a/src/git-auth-helper.ts +++ b/src/git-auth-helper.ts @@ -157,7 +157,8 @@ class GitAuthHelper { // by process creation audit events, which are commonly logged. For more information, // refer to https://docs.microsoft.com/en-us/windows-server/identity/ad-ds/manage/component-updates/command-line-process-auditing const output = await this.git.submoduleForeach( - `git config --local '${this.tokenConfigKey}' '${this.tokenPlaceholderConfigValue}' && git config --local --show-origin --name-only --get-regexp remote.origin.url`, + // wrap the pipeline in quotes to make sure it's handled properly by submoduleForeach, rather than just the first part of the pipeline + `sh -c "git config --local '${this.tokenConfigKey}' '${this.tokenPlaceholderConfigValue}' && git config --local --show-origin --name-only --get-regexp remote.origin.url"`, this.settings.nestedSubmodules ) @@ -365,7 +366,8 @@ class GitAuthHelper { const pattern = regexpHelper.escape(configKey) await this.git.submoduleForeach( - `git config --local --name-only --get-regexp '${pattern}' && git config --local --unset-all '${configKey}' || :`, + // wrap the pipeline in quotes to make sure it's handled properly by submoduleForeach, rather than just the first part of the pipeline + `sh -c "git config --local --name-only --get-regexp '${pattern}' && git config --local --unset-all '${configKey}' || :"`, true ) } diff --git a/src/misc/licensed-check.sh b/src/misc/licensed-check.sh index f5066fd..81987b6 100755 --- a/src/misc/licensed-check.sh +++ b/src/misc/licensed-check.sh @@ -5,4 +5,4 @@ set -e src/misc/licensed-download.sh echo 'Running: licensed cached' -_temp/licensed-3.3.1/licensed status
\ No newline at end of file +_temp/licensed-3.6.0/licensed status
\ No newline at end of file diff --git a/src/misc/licensed-download.sh b/src/misc/licensed-download.sh index 192091e..973e8e2 100755 --- a/src/misc/licensed-download.sh +++ b/src/misc/licensed-download.sh @@ -2,23 +2,23 @@ set -e -if [ ! -f _temp/licensed-3.3.1.done ]; then +if [ ! -f _temp/licensed-3.6.0.done ]; then echo 'Clearing temp' - rm -rf _temp/licensed-3.3.1 || true + rm -rf _temp/licensed-3.6.0 || true echo 'Downloading licensed' - mkdir -p _temp/licensed-3.3.1 - pushd _temp/licensed-3.3.1 + mkdir -p _temp/licensed-3.6.0 + pushd _temp/licensed-3.6.0 if [[ "$OSTYPE" == "darwin"* ]]; then - curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/3.3.1/licensed-3.3.1-darwin-x64.tar.gz + curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/3.6.0/licensed-3.6.0-darwin-x64.tar.gz else - curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/3.3.1/licensed-3.3.1-linux-x64.tar.gz + curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/3.6.0/licensed-3.6.0-linux-x64.tar.gz fi echo 'Extracting licenesed' tar -xzf licensed.tar.gz popd - touch _temp/licensed-3.3.1.done + touch _temp/licensed-3.6.0.done else echo 'Licensed already downloaded' fi diff --git a/src/misc/licensed-generate.sh b/src/misc/licensed-generate.sh index e66e03b..d2e1877 100755 --- a/src/misc/licensed-generate.sh +++ b/src/misc/licensed-generate.sh @@ -5,4 +5,4 @@ set -e src/misc/licensed-download.sh echo 'Running: licensed cached' -_temp/licensed-3.3.1/licensed cache
\ No newline at end of file +_temp/licensed-3.6.0/licensed cache
\ No newline at end of file |
