From dcd167b9bb928c6b52e32d0424c6ee5919d9cefd Mon Sep 17 00:00:00 2001 From: YZBruh Date: Thu, 3 Oct 2024 22:51:49 +0300 Subject: [PATCH] pmt: f*** --- .github/workflows/build.yml | 2 +- CHANGELOG.md | 4 ++-- pmt-termux.sh | 15 ++++++++------- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 14be707..ea5ec9f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,6 +67,7 @@ jobs: - name: Last small transactions id: small-transactions run: | + export CXX_64="${PWD}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang++" export CXX_VERSION=$(${CXX_64} --version | head -n 1) echo "CXX_VERSION=${CXX_VERSION}" >> $GITHUB_ENV . ${{ env.PMT_SRCDIR }}/build/workflow/build.config @@ -87,7 +88,6 @@ jobs: with: files: | /home/pmt/pmt*.xz - /home/pmt/pmt*.deb /home/pmt/pmt-objs-local.zip /home/pmt/mandoc.gz name: Partition Manager ${{ env.PMT_VERSION }} Release diff --git a/CHANGELOG.md b/CHANGELOG.md index e5ec2f4..f1a7d2e 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -### Version 2.9.0 Changelog +### Version 2.9.1 Changelog - All dependencies related to e2fsprogs were added into pmt for built-in mke2fs - Partition size displaying feature added @@ -7,5 +7,5 @@ - Some minor changes on compilation system ``` -END OF 2.9.0 UPDATE CHANGELOG +END OF 2.9.1 UPDATE CHANGELOG ``` diff --git a/pmt-termux.sh b/pmt-termux.sh index 70b2249..c06af9a 100755 --- a/pmt-termux.sh +++ b/pmt-termux.sh @@ -48,7 +48,7 @@ function script_head() { printc " --- Partition Manager Termux Helper Script --- # For display help message function view_help() { - echo ${SILENT} -n "Usage: " + ${SILENT} || echo -n "Usage: " if echo "${0}" | grep "./" >&/dev/null; then printc "${0} [OPTIONS]..." else @@ -135,9 +135,11 @@ function download() local URL="https://github.com/${LOCAL_OWNER}/${LOCAL_REPO}/releases/tag/${LOCAL_RELEASE_TAG}/download/pmt-${LOCAL_ARCH}-${LOCAL_RELDATE}.xz" local URL_MANDOC="https://github.com/${LOCAL_OWNER}/${LOCAL_REPO}/releases/tag/${LOCAL_RELEASE_TAG}/download/mandoc.gz" + cd "${LOCAL_TMPDIR}" print "Downloading: 'pmt-${LOCAL_ARCH}-${LOCAL_RELDATE}.xz'..." - curl -L "${URL}" -o "${LOCAL_TMPDIR}/pmt-${LOCAL_ARCH}.xz" &>/dev/null \ + wget "${URL}" &>/dev/null \ || abort "Download failed!" + cd - &>/dev/null HAVE_MANDOC=true print "Downloading mandoc..." @@ -156,8 +158,8 @@ function setup_packages() print "Updating mirrors..." pkg update &>/dev/null || abort "Updating failed!" - print "Installing xz-utils..." - pkg install -y xz-utils &>/dev/null \ + print "Installing xz-utils, wget..." + pkg install -y xz-utils wget &>/dev/null \ || abort "Installing failed!" print "Success." @@ -183,7 +185,7 @@ function install_fn() cd "${LOCAL_TMPDIR}" print "Extracting package..." - if xz -d "$(basename *.xz)" ; then + if unxz "$(basename *.xz)" &>/dev/null; then rm -f "pmt*.xz" else abort "Failed! Cannot extract pmt package." @@ -229,7 +231,6 @@ trap "cleanup" SIGQUIT PACKAGE=false ALREADY_SHIFT=false HAVE_MANDOC=false -# set -x # Process arguments while (($# >= 1)); do @@ -286,7 +287,7 @@ done ### Main ### [ -z "${1}" -a "${SOME_SPEC}" != 1 ] && view_help && exit 1 -if [ "${PROCESS}" -le 2 ]; then +if [ "${PROCESS}" = 1 -o "${PROCESS}" = 2 ]; then script_head really_termux gen_tempdir