From 115dfcd80bd963e99534fa1bf6e7b30239b5c10f Mon Sep 17 00:00:00 2001
From: VR-25 <28943176+VR-25@users.noreply.github.com>
Date: Mon, 22 Jul 2024 14:38:17 +0100
Subject: [PATCH] Version bump & miscellaneous fixes

---
 CHANGELOG | 15 +++++++--------
 README.md |  4 ++--
 TODO      |  1 +
 build.sh  |  4 ++--
 tarb.sh   |  7 ++++---
 5 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index b661ae2..8f51c4f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+v2024.7.22 202407220
+- Improve module support for all available frameworks
+- Make build script work on BSD and MacOS
+- Support Android 12+ SSAID backup/restore
+- Support root environments without su (e.g., rooted adb)
+- Update help text
+
 v2023.10.22 202310220
 - Fix -u; add curl bins
 - Fix APK checksum logic
@@ -9,11 +16,3 @@ v2023.10.16 202310150
 - Handle failed binary downloads (build.sh)
 - Updated bundled binaries
 - Use less instead of more for displaying the help text
-
-v2023.7.25 202307250
-- 347305d Extract binaries with gzip -d, instead of -dc
-- d3ee489 Print a blank line after GMS backup restore
-- 3fcb12d Backup tarb itself only if BKPDIR is unset
-- db3f3e8 Hide password from log
-- fcc9f36 Support app data isolation via /mnt/data
-- cb781d6 Update module installer
diff --git a/README.md b/README.md
index d0d3426..d01f1d5 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 ---
 Backup/restore apps and respective data, SSAIDs, runtime permissions, system settings, Magisk modules, and more.
 
-All required binaries/executables are included: busybox for general tools, openssl for encryption, tar for archiving, and zstd for compression.
+All required binaries/executables are included: busybox for general tools, curl for updates, openssl for encryption, tar for archiving, and zstd for compression.
 
 **Works in recovery mode as well.**
 
@@ -30,7 +30,7 @@ Refer to the sources below for more information:
 
 e.g., `# sh /sdcard/tarb-arm64`
 
-The -m option installs Tarb as a Magisk module -- to be available system-wide, as `tarb` and `/data/t` (for recovery).
+The `-m` option installs Tarb as a Magisk/KernelSU module -- to be available system-wide, as `tarb` and `/data/t` (for recovery).
 
 
 ---
diff --git a/TODO b/TODO
index 250ed01..b3ef524 100644
--- a/TODO
+++ b/TODO
@@ -1,2 +1,3 @@
 Limit backups by size
 Split backups larger than 3.9GB
+Wizard
diff --git a/build.sh b/build.sh
index fd36df0..c1a409a 100755
--- a/build.sh
+++ b/build.sh
@@ -15,7 +15,7 @@ offline=false
 
 ver="$(head -n1 CHANGELOG)"
 echo "$ver" | cut -d ' ' -f 2 > build/VERSION
-sed -i "/^VERSION=/s/=.*/=\"$ver\"/" tarb.sh
+sed -i"" "/^VERSION=/s/=.*/=\"$ver\"/" tarb.sh
 
 mkdir -p $TMPDIR
 [ -n "${1-}" ] || set -- arm arm64 x86 x64
@@ -41,7 +41,7 @@ for i in $*; do
   done
   sed "s/BINLINENO/$BIN_LINE/" tarb.sh > $TMPDIR/tarb-$i
   tar -cf - -C $TMPDIR/$i . | gzip -9 | base64 >> $TMPDIR/tarb-$i
-  sed -i "/^ABI=/s/=.*/=$i/" $TMPDIR/tarb-$i
+  sed -i"" "/^ABI=/s/=.*/=$i/" $TMPDIR/tarb-$i
   rm -rf $TMPDIR/$i
   echo
 done
diff --git a/tarb.sh b/tarb.sh
index f82990c..b9c5ec1 100644
--- a/tarb.sh
+++ b/tarb.sh
@@ -992,9 +992,9 @@ CUST_EXEC=/data/adb/vr25/bin
 PASSF=$TMPDIR/.pass
 
 AUTHOR="VR-25 @ GitHub"
-COPYRIGHT_YEAR=2022-2023
-DESCRIPTION="Backup/restore apps and respective data, SSAIDs, runtime permissions, generic system settings, Magisk modules, and more."
-VERSION="v2023.10.22 202310220"
+COPYRIGHT_YEAR=2022-2024
+DESCRIPTION="Backup/restore apps and respective data, SSAIDs, runtime permissions, generic system settings, Magisk/KernelSU modules, and more."
+VERSION="v2024.7.22 202407220"
 
 [ -z "${LINENO-}" ] || export PS4='$LINENO: '
 mkdir -p ${BKP_DIR##* } $BIN_DIR
@@ -1141,6 +1141,7 @@ name=Tarb
 version=${VERSION% *}
 versionCode=${VERSION#* }
 EOF
+  echo "✅"
   ;;
 
   -o) optimize;;