diff --git a/scripts/bump_tag.sh b/scripts/bump_tag.sh index 069cf9fddd..db16e557a0 100755 --- a/scripts/bump_tag.sh +++ b/scripts/bump_tag.sh @@ -18,7 +18,7 @@ if [[ -z "$CURRENT_VERSION" || "$CURRENT_VERSION" == "null" ]]; then fi # Parse semver components -IFS='.' read -r MAJOR MINOR_V PATCH <<< "$CURRENT_VERSION" +IFS='.' read -r MAJOR MINOR_V PATCH <<<"$CURRENT_VERSION" # Calculate new version if [[ "$MINOR" == "true" ]]; then @@ -30,7 +30,7 @@ fi echo "Bumping version: $CURRENT_VERSION -> $NEW_VERSION" # Update package.json -jq --arg v "$NEW_VERSION" '.version = $v' package.json > package.json.tmp +jq --arg v "$NEW_VERSION" '.version = $v' package.json >package.json.tmp mv package.json.tmp package.json # Commit and tag diff --git a/src/common/utils/git/gitStatus.ts b/src/common/utils/git/gitStatus.ts index 74ad93897c..e6650c71f6 100644 --- a/src/common/utils/git/gitStatus.ts +++ b/src/common/utils/git/gitStatus.ts @@ -92,7 +92,7 @@ export const GIT_FETCH_SCRIPT = ` export GIT_TERMINAL_PROMPT=0 export GIT_ASKPASS=echo export SSH_ASKPASS=echo -export GIT_SSH_COMMAND="ssh -o BatchMode=yes -o StrictHostKeyChecking=accept-new" +export GIT_SSH_COMMAND="\${GIT_SSH_COMMAND:-ssh} -o BatchMode=yes -o StrictHostKeyChecking=accept-new" # Fast fetch with optimization flags git -c protocol.version=2 \\