Enhancements and flashable zip generator

Author: VR-25

.gitattributes

@@ -2,5 +2,5 @@
 ** text eol=lf
 
 # Denote all files that are truly binary and should not be modified.
+*.zip binary
 bin/** binary
-system/app/** binary

.gitignore

@@ -1,3 +1,3 @@
-_builds
-_misc
 *.zip
+update-binary
+customize.sh

META-INF/com/google/android/updater-script

@@ -0,0 +1 @@
+#MAGISK

README.html

@@ -52,9 +52,12 @@ <h2 id="license">License</h2>
 
 You should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses/.
 </code></pre>
+<h2 id="generate-a-magisk-module-flashable-zip">Generate a Magisk Module Flashable Zip</h2>
+<pre><code>sh /path/to/zip.sh
+</code></pre>
 <h2 id="installupgrade">Install/Upgrade</h2>
 <pre><code>Android (Magisk module)
-  su -c sh /path/to/install.sh [--start]
+  Flash the zip or run su -c sh /path/to/install.sh [--start]
 
 GNU/Linux
   sudo sh /path/to/install.sh [--start]
@@ -74,7 +77,7 @@ <h2 id="config">Config</h2>
   /etc/zram-swap-manager.conf
 </code></pre>
 <h2 id="terminal">Terminal</h2>
-<pre><code>zram-swap-manager --help
+<pre><code>Run zsm or zram-swap-manager for help.
 </code></pre>
 <h2 id="benchmarks">Benchmarks</h2>
 <table>
@@ -139,7 +142,7 @@ <h2 id="benchmarks">Benchmarks</h2>
 </table>
 <h2 id="donations">Donations</h2>
 <ul>
-<li>Airtm Username: ivandro863auzqg</li>
+<li><a href="https://app.airtm.com/send-or-request/send">Airtm username: ivandro863auzqg</a></li>
 <li><a href="https://liberapay.com/vr25/">Liberapay</a></li>
 <li><a href="https://patreon.com/vr25/">Patreon</a></li>
 <li><a href="https://paypal.me/vr25xda/">PayPal</a></li>

README.md

@@ -16,9 +16,12 @@
 
     You should have received a copy of the GNU General Public License along with this program. If not, see https://www.gnu.org/licenses/.
 
+## Generate a Magisk Module Flashable Zip
+    sh /path/to/zip.sh
+
 ## Install/Upgrade
     Android (Magisk module)
-      su -c sh /path/to/install.sh [--start]
+      Flash the zip or run su -c sh /path/to/install.sh [--start]
 
     GNU/Linux
       sudo sh /path/to/install.sh [--start]
@@ -38,7 +41,7 @@
       /etc/zram-swap-manager.conf
 
 ## Terminal
-    zram-swap-manager --help
+    Run zsm or zram-swap-manager for help.
 
 ## Benchmarks
 |    Compressor	   | Ratio	| Compression | Decompression |
@@ -53,7 +56,7 @@
 |    lzf 3.6 -1	   | 2.077	|   400 MB/s	|   860 MB/s    |
 
 ## Donations
-- Airtm Username: ivandro863auzqg
+- [Airtm username: ivandro863auzqg](https://app.airtm.com/send-or-request/send)
 - [Liberapay](https://liberapay.com/vr25/)
 - [Patreon](https://patreon.com/vr25/)
 - [PayPal](https://paypal.me/vr25xda/)

android/setup-busybox.sh renamed to busybox.sh

@@ -1,10 +1,3 @@
-# Busybox Setup
-# Copyright 2019-2020, VR25
-# License: GPLv3+
-#
-# Usage: . $0
-
-
 [ -x /dev/.vr25/busybox/ls ] || {
   mkdir -p /dev/.vr25/busybox
   chmod 0700 /dev/.vr25/busybox

install.sh

@@ -5,41 +5,77 @@
   exit 2
 }
 
-cd "${0%/*}" 2>/dev/null
+# set source code directory
+src="$(cd "${0%/*}" 2>/dev/null; echo "$PWD")"
+
+# for magisk
+SKIPUNZIP=1
 
 if [ -d /data/adb ]; then
+
   # android
-  . $PWD/android/setup-busybox.sh
+
+  # extract flashable zip if source code is unavailable
+  [ -f $src/TODO ] || {
+    src=/dev/.vr25-zsm-install
+    on_exit() { rm -rf ${src:-//} 2>/dev/null; }
+    on_exit
+    trap on_exit EXIT
+    mkdir $src
+    unzip "${3:-${ZIPFILE}}" -d $src/ >&2
+  }
+
+  . $src/busybox.sh
+
   install_dir=/data/adb/modules/zram-swap-manager
   data_dir=/data/adb/vr25/zram-swap-manager-data
+
   rm -rf $install_dir 2>/dev/null
   mkdir -p $install_dir/system/bin $data_dir
-  cp $PWD/zram-swap-manager.sh $install_dir/
+
+  cp $src/zram-swap-manager.sh $install_dir/
     ln -sf $install_dir/zram-swap-manager.sh $install_dir/system/bin/zram-swap-manager
       ln -sf $install_dir/zram-swap-manager.sh $install_dir/system/bin/zsm
     ln -sf $install_dir/zram-swap-manager.sh /sbin/zram-swap-manager 2>/dev/null \
       && ln -sf $install_dir/zram-swap-manager.sh /sbin/zsm
-  [ -f $data_dir/config.txt ] || cp $PWD/zram-swap-manager.conf $data_dir/config.txt
-  cp $PWD/uninstall.sh $install_dir/
+
+  [ -f $data_dir/config.txt ] || cp $src/zram-swap-manager.conf $data_dir/config.txt
+
+  cp $src/uninstall.sh $install_dir/
     ln -sf $install_dir/uninstall.sh $install_dir/system/bin/zram-swap-manager-uninstall
     ln -sf $install_dir/uninstall.sh /sbin/zram-swap-manager-uninstall 2>/dev/null
+
   for i in $install_dir/*.sh; do
     sed -i 's|^#!/.*|#!/system/bin/sh|' $i
   done
+
+  i="$PWD"
+  cd $src/
+  cp busybox.sh module.prop service.sh $install_dir/
+  cd "$i"
   unset i
-  cp $PWD/android/* $install_dir/
   chmod +x $install_dir/*.sh
   [ ".$1" != .--start ] || $install_dir/service.sh
+
 else
+
   # gnu/linux
+
   [ -f /etc/zram-swap-manager.conf ] && upgrade=true
-  sh $PWD/uninstall.sh --keep-config >/dev/null 2>&1
+  sh $src/uninstall.sh --keep-config >/dev/null 2>&1
   mkdir -p /usr/local/bin/
-  install -m 644 $PWD/zram-swap-manager.service /etc/systemd/system/zram-swap-manager.service
-  install -m 755 $PWD/zram-swap-manager.sh /usr/local/bin/zram-swap-manager
+
+  install -m 644 $src/zram-swap-manager.service /etc/systemd/system/zram-swap-manager.service
+
+  install -m 755 $src/zram-swap-manager.sh /usr/local/bin/zram-swap-manager
     ln -s /usr/local/bin/zram-swap-manager /usr/local/bin/zsm
-  ${upgrade:-false} || install -m 644 $PWD/zram-swap-manager.conf /etc/
-  install -m 755 $PWD/uninstall.sh /usr/local/bin/zram-swap-manager-uninstall
+
+  ${upgrade:-false} || install -m 644 $src/zram-swap-manager.conf /etc/
+  install -m 755 $src/uninstall.sh /usr/local/bin/zram-swap-manager-uninstall
+
   systemctl enable zram-swap-manager
   [ ".$1" != .--start ] || zram-swap-manager -r
+
 fi
+
+echo "Done!"

android/module.prop renamed to module.prop

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+
+{ cd "${0%/*}"
+cp -u install.sh customize.sh
+cp -u install.sh META-INF/com/google/android/update-binary; } 2>/dev/null
+zip -r9 zsm-magisk-$(date +%Y%m%d%H%m%S).zip * .git* -x \*.zip -x .git/\*

android/service.sh renamed to service.sh

@@ -1,24 +1,24 @@
-# : ${comp_algorithm:=lz4}
-# : ${comp_ratio:=210}
-# : ${mem_percent:=33}
+comp_algorithm=lz4
+comp_ratio=210
+mem_percent=33
 
-# : ${mem_total:=$(awk '/^MemTotal:/{print $2}' /proc/meminfo)}
-# : ${mem_limit:=$(calc "$mem_total * $mem_percent / 100 * 1024")}
-# : ${disksize:=$(calc "$mem_limit * $comp_ratio / 100")}
+mem_total=$(awk '/^MemTotal:/{print $2' /proc/meminfo)
+mem_limit=$(calc "$mem_total * $mem_percent / 100 * 1024")
+disksize=$(calc "$mem_limit * $comp_ratio / 100")
 
-# : ${max_comp_streams:=$(( $(cut -d- -f2 /sys/devices/system/cpu/present) + 1 ))}
-# : ${swap_device:=$([ -d /data/adb ] && echo /dev/block/zram || echo /dev/zram)}
+max_comp_streams=$(( $(cut -d- -f2 /sys/devices/system/cpu/present) + 1 ))
+swap_device=$([ -d /data/adb ] && echo /dev/block/zram || echo /dev/zram)
 
-# : ${dynamic_swappiness:=true}
-# : ${load_sampling_rate:=60}
-# : ${high_load_threshold:=90}
-# : ${high_load_swappiness:=80}
-# : ${medium_load_threshold:=45}
-# : ${medium_load_swappiness:=90}
-# : ${low_load_threshold:=0}
-# : ${low_load_swappiness:=100}
+dynamic_swappiness=true
+load_sampling_rate=60
+high_load_threshold=90
+high_load_swappiness=80
+medium_load_threshold=45
+medium_load_swappiness=90
+low_load_threshold=0
+low_load_swappiness=100
 
-# ${vm:=swappiness=$high_load_swappiness}
+vm="swappiness=80 vfs_cache_pressure=200"
 
-# android's low memory killer
+# android's low memory killer (deprecated in favor of lmkd in recent OS versions)
 # write /sys/module/lowmemorykiller/parameters/minfree "CUSTOM PARAMETERS GO HERE"

zip.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-version="v2021.10.24-beta (202110240)"
+version="v2021.10.26-beta (202110260)"
 info="zRAM Swap Manager $version
 Copyright (C) 2021, VR25
 License: GPLv3+
@@ -135,8 +135,7 @@ do
   }
 done
 
-[ -f $magisk_mod/setup-busybox.sh ] \
-  && . $magisk_mod/setup-busybox.sh
+[ -f $magisk_mod/busybox.sh ] && . $magisk_mod/busybox.sh
 
 # default settings
 
@@ -160,7 +159,7 @@ done
 : ${low_load_threshold:=0}
 : ${low_load_swappiness:=100}
 
-: ${vm:=swappiness=$high_load_swappiness}
+: ${vm:=swappiness=80 vfs_cache_pressure=200}
 
 case $1 in
   -*c) shift; edit_config "$@";;