Skip to content

Commit 1636b5d

Browse files
committed
Fix script syntax
1 parent d99b7dd commit 1636b5d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

scripts/install_swift_sdk.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -128,8 +128,8 @@ swift --version
128128
log "Installing Swift SDK"
129129
swift sdk install "$sdk_path"
130130

131+
log "Swift SDK Post-install"
131132
if [[ "$sdk" == "android-sdk" ]]; then
132-
log "Swift SDK Post-install"
133133
# guess some common places where the swift-sdks file lives
134134
cd ~/Library/org.swift.swiftpm || cd ~/.config/swiftpm || cd ~/.local/swiftpm || cd ~/.swiftpm || cd /root/.swiftpm || exit 1
135135

@@ -139,7 +139,7 @@ if [[ "$sdk" == "android-sdk" ]]; then
139139
unzip -q ndk.zip
140140
rm ndk.zip
141141
export ANDROID_NDK_HOME="${PWD}/android-ndk-${android_ndk_version}"
142-
bundledir=$(ls -d swift-sdks/*android*.artifactbundle | head -n 1)
143-
${bundledir}/swift-android/scripts/setup-android-sdk.sh
142+
bundledir=$(find . -type d -maxdepth 2 -name '*android*.artifactbundle' | head -n 1)
143+
"${bundledir}"/swift-android/scripts/setup-android-sdk.sh
144144
cd - || exit
145145
fi

0 commit comments

Comments
 (0)