Skip to content

Commit 0a9307b

Browse files
committed
please.sh: do not complain if 32-bit Git for Windows SDK does not exist
Or better put: do not complain if the location specified by `windows.sdk32.path` does not exist (yet). The reason: this script is in heavy use in VSTS build agents, where it is thoroughly possible that only the 64-bit Git for Windows SDK is initialized (e.g. when there is no need for the 32-bit one). Signed-off-by: Johannes Schindelin <[email protected]>
1 parent 1bc1a7a commit 0a9307b

File tree

1 file changed

+7
-8
lines changed

1 file changed

+7
-8
lines changed

please.sh

+7-8
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,13 @@ export CHERE_INVOKING=1
4848
unset ORIGINAL_PATH
4949

5050
sdk_path () { # <bitness>
51-
result="$(git config windows.sdk"$1".path)" && test -n "$result" ||
52-
result="C:/git-sdk-$1"
53-
54-
test -e "$result" ||
55-
die "%s\n\n%s\n%s\n" \
56-
"Could not determine location of Git for Windows SDK $1-bit" \
57-
"Default location: C:/git-sdk-$1" \
58-
"Config variable to override: windows.sdk$1.path"
51+
result="$(git config windows.sdk"$1".path)" && test -n "$result" || {
52+
result="C:/git-sdk-$1" && test -e "$result" ||
53+
die "%s\n\n\t%s\n%s\n" \
54+
"No $1-bit Git for Windows SDK found at location:" \
55+
"C:/git-sdk-$1" \
56+
"Config variable to override: windows.sdk$1.path"
57+
}
5958

6059
echo "$result"
6160
}

0 commit comments

Comments
 (0)