Skip to content

Commit

Permalink
Merge pull request #2779 from hughns/build-sdk-fix
Browse files Browse the repository at this point in the history
Escape paths in build_rust_sdk script
  • Loading branch information
bmarty authored May 2, 2024
2 parents 62976ee + fd54aeb commit 4c6bac8
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tools/sdk/build_rust_sdk.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ else
cd matrix-rust-sdk-$date
git checkout ${rustSdkBranch}
rustSdkPath=$(pwd)
cd ${elementPwd}
cd "${elementPwd}"
fi


cd ${rustSdkPath}
cd "${rustSdkPath}"
git status

read -p "Will build with this version of the Rust SDK ^. Is it correct (yes/no) default to yes? " sdkCorrect
Expand All @@ -47,7 +47,7 @@ fi
read -p "Do you want to build the app after (yes/no) default to yes? " buildApp
buildApp=${buildApp:-yes}

cd ${elementPwd}
cd "${elementPwd}"

# If folder ../matrix-rust-components-kotlin does not exist, clone the repo
if [ ! -d "../matrix-rust-components-kotlin" ]; then
Expand All @@ -62,9 +62,9 @@ git checkout main
git pull

printf "\nBuilding the SDK for aarch64-linux-android...\n\n"
./scripts/build.sh -p ${rustSdkPath} -m sdk -t aarch64-linux-android -o ${elementPwd}/libraries/rustsdk
./scripts/build.sh -p "${rustSdkPath}" -m sdk -t aarch64-linux-android -o "${elementPwd}/libraries/rustsdk"

cd ${elementPwd}
cd "${elementPwd}"
mv ./libraries/rustsdk/sdk-android-debug.aar ./libraries/rustsdk/matrix-rust-sdk.aar
mkdir -p ./libraries/rustsdk/sdks
cp ./libraries/rustsdk/matrix-rust-sdk.aar ./libraries/rustsdk/sdks/matrix-rust-sdk-${date}.aar
Expand Down

0 comments on commit 4c6bac8

Please sign in to comment.