From 62e0b9f1372e0ece39426b84a08038f41130eff3 Mon Sep 17 00:00:00 2001 From: Jia Yuan Lo Date: Fri, 21 Jun 2024 18:07:31 +0800 Subject: [PATCH] Adjust directory --- build-package.sh | 6 ++++-- generate-bootstraps.sh | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build-package.sh b/build-package.sh index dab4e7c..fd57448 100755 --- a/build-package.sh +++ b/build-package.sh @@ -8,7 +8,7 @@ export TERMUX_NDK_VERSION_NUM export TERMUX_NDK_REVISION export TERMUX_PKG_ENABLE_CLANG16_PORTING=false -cd "$REPOROOT/termux-packages" +pushd "$REPOROOT/termux-packages" git reset --hard case "$1" in @@ -23,7 +23,7 @@ arm-vfpv3-d16) sed \ -e "s|^TERMUX_PKG_SRCURL=.*|TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r23c-linux.zip|" \ -e "s|^TERMUX_PKG_SHA256=.*|TERMUX_PKG_SHA256=6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242|" \ - -i "$REPOROOT/packages/$p/build.sh" + -i "packages/$p/build.sh" done patch -p1 -i "$REPOROOT/termux-packages.$1.lf.patch" #patch -p1 -i "$REPOROOT/termux-packages.$1.crlf.patch" @@ -58,3 +58,5 @@ mv "output" "$REPOROOT/output" echo "[*] Generated packages:" ls -lh "$REPOROOT/output" + +popd diff --git a/generate-bootstraps.sh b/generate-bootstraps.sh index bf2774a..694165c 100755 --- a/generate-bootstraps.sh +++ b/generate-bootstraps.sh @@ -6,7 +6,7 @@ export TERMUX_ARCH export TERMUX_NDK_VERSION_NUM export TERMUX_NDK_REVISION -cd "$REPOROOT/termux-packages" +pushd "$REPOROOT/termux-packages" git reset --hard case "$1" in @@ -21,7 +21,7 @@ arm-vfpv3-d16) sed \ -e "s|^TERMUX_PKG_SRCURL=.*|TERMUX_PKG_SRCURL=https://dl.google.com/android/repository/android-ndk-r23c-linux.zip|" \ -e "s|^TERMUX_PKG_SHA256=.*|TERMUX_PKG_SHA256=6ce94604b77d28113ecd588d425363624a5228d9662450c48d2e4053f8039242|" \ - -i "$REPOROOT/packages/$p/build.sh" + -i "packages/$p/build.sh" done patch -p1 -i "$REPOROOT/termux-packages.$1.lf.patch" #patch -p1 -i "$REPOROOT/termux-packages.$1.crlf.patch" @@ -45,3 +45,5 @@ arm-vfpv3-d16) *) mv -v bootstrap-*.zip "$REPOROOT" esac + +popd