From 8587eab41cd6ad69fb48ef9b0cf7cdd9e4c16dd6 Mon Sep 17 00:00:00 2001 From: m2049r Date: Mon, 8 Oct 2018 17:47:55 +0200 Subject: [PATCH] whitespace & cleanup --- .../script/android-openssl/build-all-arch.sh | 2 +- .../script/android-openssl/setenv-android-mod.sh | 10 +++++----- external-libs/script/install.sh | 4 ++-- external-libs/script/libsodium-build.sh | 2 +- external-libs/script/monero-build.sh | 2 +- external-libs/script/use-archive.sh | 13 ------------- 6 files changed, 10 insertions(+), 23 deletions(-) delete mode 100755 external-libs/script/use-archive.sh diff --git a/external-libs/script/android-openssl/build-all-arch.sh b/external-libs/script/android-openssl/build-all-arch.sh index 1cca21c..29ca84e 100755 --- a/external-libs/script/android-openssl/build-all-arch.sh +++ b/external-libs/script/android-openssl/build-all-arch.sh @@ -77,7 +77,7 @@ for arch in ${archs[@]}; do file libssl.so cp libcrypto.a $TARGET_LIB_DIR cp libssl.a $TARGET_LIB_DIR - + cp -aL $SRC_DIR/openssl-OpenSSL_1_0_2l/include/openssl/ $TARGET_DIR/include # ln -sf $TARGET_DIR/include $TARGET_DIR/arm/include diff --git a/external-libs/script/android-openssl/setenv-android-mod.sh b/external-libs/script/android-openssl/setenv-android-mod.sh index 82bcdbc..bdda180 100755 --- a/external-libs/script/android-openssl/setenv-android-mod.sh +++ b/external-libs/script/android-openssl/setenv-android-mod.sh @@ -118,18 +118,18 @@ if [ -z "$ANDROID_TOOLCHAIN" ] || [ ! -d "$ANDROID_TOOLCHAIN" ]; then fi case $_ANDROID_TARGET_SELECT in - arch-arm) + arch-arm) ANDROID_TOOLS="arm-linux-androideabi-gcc arm-linux-androideabi-ranlib arm-linux-androideabi-ld" ;; arch-arm64-v8a) ANDROID_TOOLS="aarch64-linux-android-gcc aarch64-linux-android-randlib aarch64-linux-android-ld" ;; - arch-x86) + arch-x86) ANDROID_TOOLS="i686-linux-android-gcc i686-linux-android-ranlib i686-linux-android-ld" - ;; - arch-x86_64) + ;; + arch-x86_64) ANDROID_TOOLS="x86_64-linux-android-gcc x86_64-linux-android-ranlib x86_64-linux-android-ld" - ;; + ;; arch-mips) ANDROID_TOOLS="mipsel-linux-android-gcc mipsel-linux-android-ranlib mipsel-linux-android-ld" ;; diff --git a/external-libs/script/install.sh b/external-libs/script/install.sh index 015e2f7..9e7c090 100755 --- a/external-libs/script/install.sh +++ b/external-libs/script/install.sh @@ -25,7 +25,7 @@ for arch in ${archs[@]}; do exit 16 ;; esac - + for package in ${packages[@]}; do INPUT_DIR=`pwd`/build/build/$package OUTPUT_DIR=`pwd`/$package/lib/$xarch @@ -36,7 +36,7 @@ for arch in ${archs[@]}; do if [ $package = "monero" ]; then rm -rf $OUTPUT_DIR/../../include cp -a $INPUT_DIR/include $OUTPUT_DIR/../.. - fi + fi done done diff --git a/external-libs/script/libsodium-build.sh b/external-libs/script/libsodium-build.sh index 6f9080d..8736e2d 100755 --- a/external-libs/script/libsodium-build.sh +++ b/external-libs/script/libsodium-build.sh @@ -35,7 +35,7 @@ for arch in ${archs[@]}; do if [ -f "$TARGET_DIR/lib/libsodium.la" ]; then continue fi - + mkdir -p $TARGET_DIR echo "building for ${arch}" diff --git a/external-libs/script/monero-build.sh b/external-libs/script/monero-build.sh index 4d50aa3..141149e 100755 --- a/external-libs/script/monero-build.sh +++ b/external-libs/script/monero-build.sh @@ -93,7 +93,7 @@ for arch in ${archs[@]}; do rm -rf $TARGET_INC_DIR mkdir -p $TARGET_INC_DIR cp -a $base_dir/src/wallet/api/wallet2_api.h $TARGET_INC_DIR - + cd $base_dir done diff --git a/external-libs/script/use-archive.sh b/external-libs/script/use-archive.sh deleted file mode 100755 index 99b31fc..0000000 --- a/external-libs/script/use-archive.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -set -e - -version=v1.5.10.5 - -curl -O -L https://github.com/fuwa0529/wownerujo/releases/download/${version}/external-libs.tgz - -rm -rf external-libs - -echo "unpacking external-libs" -tar zxfv external-libs.tgz -rm external-libs.tgz