diff options
| author | julian-CStack <97684800+julian-CStack@users.noreply.github.com> | 2024-11-05 10:44:41 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-05 11:44:41 -0500 |
| commit | 1ef9024e43e774ac2c2976c33bf9024549c9c61b (patch) | |
| tree | 4e1b77e65822523818535bfad4a419ee9bf5cb4a | |
| parent | dab8a211c18e0060d17e5d2b3dc1e57a314d4f7e (diff) | |
Ios script fix (#85)
* fix: mv will fail on consecutive runs
* fix: script cp error
| -rwxr-xr-x | external/ios/build_boost.sh | 12 | ||||
| -rwxr-xr-x | external/ios/build_openssl.sh | 10 | ||||
| -rwxr-xr-x | external/ios/build_sodium.sh | 12 |
3 files changed, 17 insertions, 17 deletions
diff --git a/external/ios/build_boost.sh b/external/ios/build_boost.sh index 4bfbfeb..805fbd0 100755 --- a/external/ios/build_boost.sh +++ b/external/ios/build_boost.sh @@ -16,11 +16,11 @@ if [ -d "$BOOST_DIR_PATH" ]; then echo "Boost directory already exists." else echo "Cloning Boost from $BOOST_URL" - mkdir -p $BOOST_DIR_PATH || true - rm -rf $BOOST_DIR_PATH || true - cp -r "${MONEROC_DIR}/external/Apple-Boost-BuildScript" $BOOST_DIR_PATH + mkdir -p "$BOOST_DIR_PATH" || true + rm -rf "$BOOST_DIR_PATH" || true + cp -r "${MONEROC_DIR}/external/Apple-Boost-BuildScript" "$BOOST_DIR_PATH" fi -cd $BOOST_DIR_PATH +cd "$BOOST_DIR_PATH" ./boost.sh -ios \ --min-ios-version ${MIN_IOS_VERSION} \ @@ -28,5 +28,5 @@ cd $BOOST_DIR_PATH --boost-version ${BOOST_VERSION} \ --no-framework -mv -f ${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}/ios/release/prefix/include/* $EXTERNAL_IOS_INCLUDE_DIR -mv -f ${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}/ios/release/prefix/lib/* $EXTERNAL_IOS_LIB_DIR
\ No newline at end of file +cp -r "${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}"/ios/release/prefix/include/boost "$EXTERNAL_IOS_INCLUDE_DIR/boost" +cp -r "${BOOST_DIR_PATH}/build/boost/${BOOST_VERSION}"/ios/release/prefix/lib/* "$EXTERNAL_IOS_LIB_DIR/"
\ No newline at end of file diff --git a/external/ios/build_openssl.sh b/external/ios/build_openssl.sh index 507ca9d..4bf6aa2 100755 --- a/external/ios/build_openssl.sh +++ b/external/ios/build_openssl.sh @@ -16,13 +16,13 @@ if [ -d "$OPEN_SSL_DIR_PATH" ]; then else mkdir -p "$OPEN_SSL_DIR_PATH" || true rm -rf "$OPEN_SSL_DIR_PATH" - cp -r "${MONEROC_DIR}/external/OpenSSL-for-iPhone" $OPEN_SSL_DIR_PATH + cp -r "${MONEROC_DIR}/external/OpenSSL-for-iPhone" "$OPEN_SSL_DIR_PATH" fi -cd $OPEN_SSL_DIR_PATH +cd "$OPEN_SSL_DIR_PATH" ./build-libssl.sh --version=1.1.1q --targets="ios-cross-arm64" --deprecated -mv -f ${OPEN_SSL_DIR_PATH}/include/* $EXTERNAL_IOS_INCLUDE_DIR -mv -f ${OPEN_SSL_DIR_PATH}/lib/libcrypto-iOS.a ${EXTERNAL_IOS_LIB_DIR}/libcrypto.a -mv -f ${OPEN_SSL_DIR_PATH}/lib/libssl-iOS.a ${EXTERNAL_IOS_LIB_DIR}/libssl.a
\ No newline at end of file +cp -r "${OPEN_SSL_DIR_PATH}"/include/* "$EXTERNAL_IOS_INCLUDE_DIR/" +cp "${OPEN_SSL_DIR_PATH}"/lib/libcrypto-iOS.a "${EXTERNAL_IOS_LIB_DIR}"/libcrypto.a +cp "${OPEN_SSL_DIR_PATH}"/lib/libssl-iOS.a "${EXTERNAL_IOS_LIB_DIR}"/libssl.a
\ No newline at end of file diff --git a/external/ios/build_sodium.sh b/external/ios/build_sodium.sh index ecb4a5e..d8f8777 100755 --- a/external/ios/build_sodium.sh +++ b/external/ios/build_sodium.sh @@ -16,13 +16,13 @@ if [ -d "$SODIUM_PATH" ]; then echo "Sodium directory already exists." else echo "Cloning Sodium from $SODIUM_URL" - mkdir -p $SODIUM_PATH || true - rm -rf $SODIUM_PATH - cp -r "${MONEROC_DIR}/external/libsodium" $SODIUM_PATH + mkdir -p "$SODIUM_PATH" || true + rm -rf "$SODIUM_PATH" + cp -r "${MONEROC_DIR}/external/libsodium" "$SODIUM_PATH" fi -cd $SODIUM_PATH +cd "$SODIUM_PATH" ../../../../libsodium_apple-ios.sh -mv -f ${SODIUM_PATH}/libsodium-apple/ios/include/* $EXTERNAL_IOS_INCLUDE_DIR -mv -f ${SODIUM_PATH}/libsodium-apple/ios/lib/* $EXTERNAL_IOS_LIB_DIR
\ No newline at end of file +cp -r "${SODIUM_PATH}"/libsodium-apple/ios/include/* "$EXTERNAL_IOS_INCLUDE_DIR/" +cp -r "${SODIUM_PATH}"/libsodium-apple/ios/lib/* "$EXTERNAL_IOS_LIB_DIR/"
\ No newline at end of file |