Skip to content

Commit bdb5602

Browse files
VR-25VR-25
committed
General fixes & optimizations
1 parent 1227eda commit bdb5602

File tree

5 files changed

+217
-11
lines changed

5 files changed

+217
-11
lines changed

‎.gitignore‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
*.zip
2-
update-binary
3-
customize.sh

‎META-INF/com/google/android/update-binary‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
#!/usr/bin/env sh
2+
3+
[ $(id -u) -eq 0 ] || {
4+
printf "\n(!) must run as root\n\n"
5+
exit 2
6+
}
7+
8+
# set source code directory
9+
src="$(cd "${0%/*}" 2>/dev/null; echo "$PWD")"
10+
11+
# for magisk
12+
SKIPUNZIP=1
13+
14+
patch_cfg() {
15+
if [ -f $cfg ] && [ "$1" != r ]; then
16+
if grep -Eq '^# :|mem_total' $cfg; then
17+
patch_cfg r
18+
else
19+
config_ver=0$(sed -n '/^config_ver=/s/.*=//p' $cfg)
20+
if [ $config_ver -lt 0202110290 ]; then
21+
sed -i -e '1iconfig_ver=202110290\n' -e '/^comp_a/s/=.*/=auto/' -e '/^vm=/s/e=200\"/e=200 page-cluster=0\"/' $cfg
22+
fi
23+
fi
24+
else
25+
install -m 644 $src/zram-swap-manager.conf $cfg
26+
fi
27+
}
28+
29+
if [ -d /data/adb ]; then
30+
31+
# android
32+
33+
# extract flashable zip if source code is unavailable
34+
[ -f $src/TODO ] || {
35+
src=/dev/.vr25-zsm-install
36+
on_exit() { rm -rf ${src:-//} 2>/dev/null; }
37+
on_exit
38+
trap on_exit EXIT
39+
mkdir $src
40+
unzip "${3:-${ZIPFILE}}" -d $src/ >&2
41+
}
42+
43+
. $src/busybox.sh
44+
45+
install_dir=/data/adb/modules/zram-swap-manager
46+
data_dir=/data/adb/vr25/zram-swap-manager-data
47+
cfg=/data/adb/vr25/zram-swap-manager-data/config.txt
48+
49+
rm -rf $install_dir 2>/dev/null
50+
mkdir -p $install_dir/system/bin $data_dir
51+
52+
cp $src/zram-swap-manager.sh $install_dir/
53+
ln -sf $install_dir/zram-swap-manager.sh $install_dir/system/bin/zram-swap-manager
54+
ln -sf $install_dir/zram-swap-manager.sh $install_dir/system/bin/zsm
55+
ln -sf $install_dir/zram-swap-manager.sh /sbin/zram-swap-manager 2>/dev/null \
56+
&& ln -sf $install_dir/zram-swap-manager.sh /sbin/zsm
57+
58+
[ -f $data_dir/config.txt ] || cp $src/zram-swap-manager.conf $data_dir/config.txt
59+
60+
cp $src/uninstall.sh $install_dir/
61+
ln -sf $install_dir/uninstall.sh $install_dir/system/bin/zram-swap-manager-uninstall
62+
ln -sf $install_dir/uninstall.sh /sbin/zram-swap-manager-uninstall 2>/dev/null
63+
64+
for i in $install_dir/*.sh; do
65+
sed -i 's|^#!/.*|#!/system/bin/sh|' $i
66+
done
67+
68+
i="$PWD"
69+
cd $src/
70+
cp busybox.sh module.prop service.sh $install_dir/
71+
cd "$i"
72+
unset i
73+
74+
patch_cfg
75+
76+
chmod +x $install_dir/*.sh
77+
[ ".$1" != .--start ] || $install_dir/service.sh
78+
79+
else
80+
81+
# gnu/linux
82+
83+
cfg=/etc/zram-swap-manager.conf
84+
[ -f $cfg ] && upgrade=true
85+
86+
sh $src/uninstall.sh --keep-config >/dev/null 2>&1
87+
mkdir -p /usr/local/bin/
88+
89+
install -m 644 $src/zram-swap-manager.service /etc/systemd/system/zram-swap-manager.service
90+
91+
install -m 755 $src/zram-swap-manager.sh /usr/local/bin/zram-swap-manager
92+
ln -s /usr/local/bin/zram-swap-manager /usr/local/bin/zsm
93+
94+
${upgrade:-false} || patch_cfg r
95+
install -m 755 $src/uninstall.sh /usr/local/bin/zram-swap-manager-uninstall
96+
97+
patch_cfg
98+
99+
systemctl enable zram-swap-manager
100+
[ ".$1" != .--start ] || zram-swap-manager -r
101+
102+
fi
103+
104+
echo "Done!"

‎customize.sh‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
#!/usr/bin/env sh
2+
3+
[ $(id -u) -eq 0 ] || {
4+
printf "\n(!) must run as root\n\n"
5+
exit 2
6+
}
7+
8+
# set source code directory
9+
src="$(cd "${0%/*}" 2>/dev/null; echo "$PWD")"
10+
11+
# for magisk
12+
SKIPUNZIP=1
13+
14+
patch_cfg() {
15+
if [ -f $cfg ] && [ "$1" != r ]; then
16+
if grep -Eq '^# :|mem_total' $cfg; then
17+
patch_cfg r
18+
else
19+
config_ver=0$(sed -n '/^config_ver=/s/.*=//p' $cfg)
20+
if [ $config_ver -lt 0202110290 ]; then
21+
sed -i -e '1iconfig_ver=202110290\n' -e '/^comp_a/s/=.*/=auto/' -e '/^vm=/s/e=200\"/e=200 page-cluster=0\"/' $cfg
22+
fi
23+
fi
24+
else
25+
install -m 644 $src/zram-swap-manager.conf $cfg
26+
fi
27+
}
28+
29+
if [ -d /data/adb ]; then
30+
31+
# android
32+
33+
# extract flashable zip if source code is unavailable
34+
[ -f $src/TODO ] || {
35+
src=/dev/.vr25-zsm-install
36+
on_exit() { rm -rf ${src:-//} 2>/dev/null; }
37+
on_exit
38+
trap on_exit EXIT
39+
mkdir $src
40+
unzip "${3:-${ZIPFILE}}" -d $src/ >&2
41+
}
42+
43+
. $src/busybox.sh
44+
45+
install_dir=/data/adb/modules/zram-swap-manager
46+
data_dir=/data/adb/vr25/zram-swap-manager-data
47+
cfg=/data/adb/vr25/zram-swap-manager-data/config.txt
48+
49+
rm -rf $install_dir 2>/dev/null
50+
mkdir -p $install_dir/system/bin $data_dir
51+
52+
cp $src/zram-swap-manager.sh $install_dir/
53+
ln -sf $install_dir/zram-swap-manager.sh $install_dir/system/bin/zram-swap-manager
54+
ln -sf $install_dir/zram-swap-manager.sh $install_dir/system/bin/zsm
55+
ln -sf $install_dir/zram-swap-manager.sh /sbin/zram-swap-manager 2>/dev/null \
56+
&& ln -sf $install_dir/zram-swap-manager.sh /sbin/zsm
57+
58+
[ -f $data_dir/config.txt ] || cp $src/zram-swap-manager.conf $data_dir/config.txt
59+
60+
cp $src/uninstall.sh $install_dir/
61+
ln -sf $install_dir/uninstall.sh $install_dir/system/bin/zram-swap-manager-uninstall
62+
ln -sf $install_dir/uninstall.sh /sbin/zram-swap-manager-uninstall 2>/dev/null
63+
64+
for i in $install_dir/*.sh; do
65+
sed -i 's|^#!/.*|#!/system/bin/sh|' $i
66+
done
67+
68+
i="$PWD"
69+
cd $src/
70+
cp busybox.sh module.prop service.sh $install_dir/
71+
cd "$i"
72+
unset i
73+
74+
patch_cfg
75+
76+
chmod +x $install_dir/*.sh
77+
[ ".$1" != .--start ] || $install_dir/service.sh
78+
79+
else
80+
81+
# gnu/linux
82+
83+
cfg=/etc/zram-swap-manager.conf
84+
[ -f $cfg ] && upgrade=true
85+
86+
sh $src/uninstall.sh --keep-config >/dev/null 2>&1
87+
mkdir -p /usr/local/bin/
88+
89+
install -m 644 $src/zram-swap-manager.service /etc/systemd/system/zram-swap-manager.service
90+
91+
install -m 755 $src/zram-swap-manager.sh /usr/local/bin/zram-swap-manager
92+
ln -s /usr/local/bin/zram-swap-manager /usr/local/bin/zsm
93+
94+
${upgrade:-false} || patch_cfg r
95+
install -m 755 $src/uninstall.sh /usr/local/bin/zram-swap-manager-uninstall
96+
97+
patch_cfg
98+
99+
systemctl enable zram-swap-manager
100+
[ ".$1" != .--start ] || zram-swap-manager -r
101+
102+
fi
103+
104+
echo "Done!"

‎zip.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
{ cd "${0%/*}"
44
cp -u install.sh customize.sh
55
cp -u install.sh META-INF/com/google/android/update-binary; } 2>/dev/null
6-
zip -r9 zsm-magisk-$(date +%Y%m%d%H%m%S).zip * .git* -x \*.zip -x .git/\*
6+
zip -r9 zsm-magisk-$(date +%Y%m%d%H%M%S).zip * .git* -x \*.zip -x .git/\*

‎zram-swap-manager.sh‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env sh
22

3-
version="v2021.10.29-beta (202110290)"
3+
version="v2021.11.6-beta (202111060)"
44
info="zRAM Swap Manager $version
55
Copyright (C) 2021, VR25
66
License: GPLv3+
@@ -22,7 +22,7 @@ edit_config() {
2222
eval "$* $config"
2323
else
2424
for i in $EDITOR vim vi nano; do
25-
which ${i%% *} && {
25+
which ${i%% *} >/dev/null && {
2626
eval "$i $config"
2727
break
2828
}
@@ -55,23 +55,23 @@ prep_exec() {
5555
[ -d /data/adb ] && {
5656
mkswap() {
5757
for exec in /data/adb/vr25/bin/mkswap /system/*bin/mkswap /sbin/mkswap "busybox mkswap"; do
58-
[ -x ${exec%% *} ] && {
58+
if [ -x ${exec%% *} ] || which ${exec%% *} >/dev/null; then
5959
eval $exec "$@" && break || echo "(i) Trying alternative..."
60-
}
60+
fi
6161
done
6262
}
6363
swapoff() {
6464
for exec in /data/adb/vr25/bin/swapoff /system/*bin/swapoff /sbin/swapoff "busybox swapoff"; do
65-
[ -x ${exec%% *} ] && {
65+
if [ -x ${exec%% *} ] || which ${exec%% *} >/dev/null; then
6666
eval $exec "$@" && break || echo "(i) Trying alternative..."
67-
}
67+
fi
6868
done
6969
}
7070
swapon() {
7171
for exec in /data/adb/vr25/bin/swapon /system/*bin/swapon /sbin/swapon "busybox swapon"; do
72-
[ -x ${exec%% *} ] && {
72+
if [ -x ${exec%% *} ] || which ${exec%% *} >/dev/null; then
7373
eval $exec "$@" && break || echo "(i) Trying alternative..."
74-
}
74+
fi
7575
done
7676
}
7777
}

0 commit comments

Comments
 (0)