yetangitu/deltachat
1
0
Fork 0
mirror of https://github.com/deltachat/deltachat-android.git synced 2025-10-03 09:49:21 +02:00
Code Issues Releases Wiki Activity

Use realpath for the case of running the script via symlink

Browse source
This commit is contained in:
link2xt 2023-01-02 14:47:04 +00:00
parent 78aada7027
commit 2f8992a77c
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/install-toolchains.sh
View file

@ -4,6 +4,6 @@
# #
set -e set -e
TARGETS="armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android" TARGETS="armv7-linux-androideabi aarch64-linux-android i686-linux-android x86_64-linux-android"
RUSTUP_TOOLCHAIN=$(cat "$(dirname "$0")/rust-toolchain") RUSTUP_TOOLCHAIN=$(cat "$(dirname $(realpath "$0"))/rust-toolchain")
rustup install "$RUSTUP_TOOLCHAIN" rustup install "$RUSTUP_TOOLCHAIN"
rustup target add $TARGETS --toolchain "$RUSTUP_TOOLCHAIN" rustup target add $TARGETS --toolchain "$RUSTUP_TOOLCHAIN"

2
scripts/ndk-make.sh
View file

@ -62,7 +62,7 @@ export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/aarch64-linux-a
export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang" export CARGO_TARGET_I686_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/i686-linux-android16-clang"
export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang" export CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER="$TOOLCHAIN/bin/x86_64-linux-android21-clang"
RUSTUP_TOOLCHAIN=$(cat "$(dirname "$0")/rust-toolchain") RUSTUP_TOOLCHAIN=$(cat "$(dirname $(realpath "$0"))/rust-toolchain")
# Check if the argument is a correct architecture: # Check if the argument is a correct architecture:
if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq $1; then if test $1 && echo "armeabi-v7a arm64-v8a x86 x86_64" | grep -vwq $1; then