better zsh compatibility

This commit is contained in:
Flux 2025-01-19 21:05:15 +02:00 committed by GitHub
parent fbeaa7e4be
commit 8c1f0e6b90
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
set -e
@ -9,8 +9,8 @@ if [ "$#" -ne 2 ]; then
fi
# Convert to absolute paths
RUST_PROJECT_FOLDER=$(cd "$1" && pwd)
FLUTTER_PROJECT_FOLDER=$(cd "$2" && pwd)
RUST_PROJECT_FOLDER="$(cd "$1" && pwd)"
FLUTTER_PROJECT_FOLDER="$(cd "$2" && pwd)"
# Supported targets for Android
ANDROID_ARCHS=("arm64-v8a" "armeabi-v7a" "x86_64" "x86")
@ -18,7 +18,7 @@ ANDROID_TARGETS=("aarch64-linux-android" "armv7-linux-androideabi" "x86_64-linux
IOS_TARGETS=("aarch64-apple-ios" "x86_64-apple-ios")
# Check if on macOS for iOS targets
if [[ "$OSTYPE" == "darwin"* ]]; then
if [[ "${OSTYPE:-}" == "darwin"* ]]; then
INCLUDE_IOS_TARGETS=true
else
INCLUDE_IOS_TARGETS=false
@ -26,11 +26,11 @@ else
fi
# Enter the Rust project folder
cd "$RUST_PROJECT_FOLDER" || exit
cd "$RUST_PROJECT_FOLDER" || exit 1
# Function to check and install missing targets
install_missing_targets() {
for target in "${@}"; do
for target in "$@"; do
if ! rustup target list --installed | grep -q "$target"; then
echo "Installing target: $target"
rustup target add "$target"
@ -64,11 +64,10 @@ if [ "$INCLUDE_IOS_TARGETS" = true ]; then
done
fi
# Copy compiled libraries to Flutter project for Android
for i in "${!ANDROID_ARCHS[@]}"; do
arch=${ANDROID_ARCHS[$i]}
target=${ANDROID_TARGETS[$i]}
arch="${ANDROID_ARCHS[$i]}"
target="${ANDROID_TARGETS[$i]}"
RELEASE_DIR="target/$target/release"
LIB_FILE=$(find "$RELEASE_DIR" -maxdepth 1 -name "lib*.so" | head -n 1)
@ -76,7 +75,7 @@ for i in "${!ANDROID_ARCHS[@]}"; do
DEST_DIR="$FLUTTER_PROJECT_FOLDER/android/app/src/main/jniLibs/$arch"
mkdir -p "$DEST_DIR"
cp "$LIB_FILE" "$DEST_DIR/"
echo "Copied $arch library to $2/android/app/src/main/jniLibs/$arch"
echo "Copied $arch library to $DEST_DIR"
else
echo "No .so files found for $arch in $RELEASE_DIR"
fi