diff options
| author | Sebastian Holmin <sebastian.holmin@mullvad.net> | 2024-01-25 11:44:41 +0100 |
|---|---|---|
| committer | Markus Pettersson <markus.pettersson@mullvad.net> | 2024-02-02 11:04:48 +0100 |
| commit | b6e0545e1b5ae2fbcb6655bd4d28739cf9f943d6 (patch) | |
| tree | 40644f1100793192c23fd7491978dc26ad1fef97 /ios | |
| parent | 1438e369b10bbf50900d9e380329001513de2c1e (diff) | |
| download | mullvadvpn-b6e0545e1b5ae2fbcb6655bd4d28739cf9f943d6.tar.xz mullvadvpn-b6e0545e1b5ae2fbcb6655bd4d28739cf9f943d6.zip | |
Fix `shellcheck` lints of our various bash scripts
The following lints have been fixed:
SC2046,SC2086,SC2068,SC2148,SC2007,SC2004,SC2006,
SC2164,SC2145,SC1091,SC2034,SC2155.
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/build-rust-library.sh | 12 | ||||
| -rwxr-xr-x | ios/build.sh | 8 |
2 files changed, 9 insertions, 11 deletions
diff --git a/ios/build-rust-library.sh b/ios/build-rust-library.sh index 3151149a1b..958b083dc0 100644 --- a/ios/build-rust-library.sh +++ b/ios/build-rust-library.sh @@ -43,18 +43,18 @@ for arch in $ARCHS; do # Intel iOS simulator export CFLAGS_x86_64_apple_ios="-target x86_64-apple-ios" - $HOME/.cargo/bin/cargo build -p $FFI_TARGET --lib $RELFLAG --target x86_64-apple-ios - $HOME/.cargo/bin/cargo build -p $FFI_TARGET --lib --target x86_64-apple-ios + "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib "$RELFLAG" --target x86_64-apple-ios + "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib --target x86_64-apple-ios ;; arm64) if [ $IS_SIMULATOR -eq 0 ]; then # Hardware iOS targets - $HOME/.cargo/bin/cargo build -p $FFI_TARGET --lib $RELFLAG --target aarch64-apple-ios - $HOME/.cargo/bin/cargo build -p $FFI_TARGET --lib --target aarch64-apple-ios + "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib "$RELFLAG" --target aarch64-apple-ios + "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib --target aarch64-apple-ios else - $HOME/.cargo/bin/cargo build -p $FFI_TARGET --lib $RELFLAG --target aarch64-apple-ios-sim - $HOME/.cargo/bin/cargo build -p $FFI_TARGET --lib --target aarch64-apple-ios-sim + "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib "$RELFLAG" --target aarch64-apple-ios-sim + "$HOME"/.cargo/bin/cargo build -p "$FFI_TARGET" --lib --target aarch64-apple-ios-sim fi esac done diff --git a/ios/build.sh b/ios/build.sh index d974a733eb..2d2e8a649c 100755 --- a/ios/build.sh +++ b/ios/build.sh @@ -41,9 +41,6 @@ XCODE_ARCHIVE_DIR="$BUILD_OUTPUT_DIR/$PROJECT_NAME.xcarchive" # Export options file used for producing .xcarchive EXPORT_OPTIONS_PATH="$SCRIPT_DIR/ExportOptions.plist" -# Path to generated IPA file produced after .xcarchive export -IPA_PATH="$BUILD_OUTPUT_DIR/$PROJECT_NAME.ipa" - # Xcodebuild intermediate files directory DERIVED_DATA_DIR="$BUILD_OUTPUT_DIR/DerivedData" @@ -68,7 +65,8 @@ install_mobile_provisioning() { fi for mobile_provisioning_path in "$IOS_PROVISIONING_PROFILES_DIR"/*.mobileprovision; do - local profile_uuid=$(get_mobile_provisioning_uuid "$mobile_provisioning_path") + local profile_uuid + profile_uuid=$(get_mobile_provisioning_uuid "$mobile_provisioning_path") local target_path="$SYSTEM_PROVISIONING_PROFILES_DIR/$profile_uuid.mobileprovision" if [[ -f "$target_path" ]]; then @@ -95,7 +93,7 @@ release_build() { -sdk iphoneos \ -configuration Release \ -derivedDataPath "$DERIVED_DATA_DIR" \ - $@ + "$@" } # Clean build directory |