Skip to content

Commit 5a5374a

Browse files
committed
scripts: make status script run even module is disabled
1 parent 200d91d commit 5a5374a

7 files changed

Lines changed: 35 additions & 29 deletions

File tree

module/customize.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,6 @@ mkdir -p /data/adb/kp-next
1010
if [ -f "/data/adb/ap/package_config" ] && [ ! -f "/data/adb/kp-next/package_config" ]; then
1111
cp "/data/adb/ap/package_config" /data/adb/kp-next/package_config
1212
fi
13+
14+
# backup module.prop
15+
cp "$MODPATH/module.prop" "$MODPATH/module.prop.bak"

module/module.prop.bak

Lines changed: 0 additions & 8 deletions
This file was deleted.

module/post-fs-data.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/system/bin/sh
2+
3+
MODDIR=${0%/*}
4+
SERVICE_D="/data/adb/service.d"
5+
STATUS_SH="$SERVICE_D/kp-next.sh"
6+
7+
if [ ! -d "$SERVICE_D" ] || [ ! -f "$STATUS_SH" ]; then
8+
mkdir -p "$SERVICE_D"
9+
cp "$MODDIR/status.sh" "$STATUS_SH"
10+
chmod 755 "$STATUS_SH"
11+
fi

module/service.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ PATH="$MODDIR/bin:$PATH"
66
CONFIG="$KPNDIR/package_config"
77
key="$(cat $KPNDIR/key | base64 -d)"
88

9-
nohup sh "$MODDIR/status.sh" "$key" &
10-
119
if [ -z "$key" ] || [ -z "$(kpatch $key hello)" ]; then
1210
touch "$MODDIR/unresolved"
1311
exit 0

module/status.sh

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/sh
22

3-
MODDIR=${0%/*}
3+
MODDIR="/data/adb/modules/KPatch-Next"
44
KPNDIR="/data/adb/kp-next"
55
PATH="$MODDIR/bin:$PATH"
66
key="$1"
77

88
PROP_FILE="$MODDIR/module.prop"
9-
PROP_BAK="$MODDIR/module.prop.bak"
9+
PROP_BAK="$PROP_FILE.bak"
1010

1111
set_prop() {
1212
local prop="$1"
@@ -23,13 +23,16 @@ set_prop() {
2323
}
2424

2525
restore_prop_if_needed() {
26-
if ! grep -q "^id=" "$PROP_FILE"; then
27-
if [ -f "$PROP_BAK" ]; then
28-
cp "$PROP_BAK" "$PROP_FILE"
29-
fi
30-
fi
26+
grep -q "^id=" "$PROP_FILE" && return
27+
[ -f "$PROP_BAK" ] && cat "$PROP_BAK" > "$PROP_FILE"
3128
}
3229

30+
# self cleanup if module removed improperly
31+
if [ ! -d "$MODDIR" ]; then
32+
rm -f "$(realpath "$0")"
33+
exit 0
34+
fi
35+
3336
active="Status: active 😊"
3437
inactive="Status: inactive 😕"
3538
info="info: key incorrect, not set or kernel not patched yet ❌"

module/uninstall.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rm -rf /data/adb/kp-next
1+
rm -rf /data/adb/kp-next /data/adb/service.d/kp-next.sh

webui/index.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,17 +64,16 @@ function updateBtnState(value) {
6464
document.getElementById('start').disabled = !value;
6565
}
6666

67-
export function initInfo() {
68-
return exec('uname -r && getprop ro.build.version.release && getprop ro.build.fingerprint && getenforce').then((result) => {
69-
if (import.meta.env.DEV) { // vite debug
70-
result.stdout = '6.18.2-linux\n16\nLinuxPC\nEnforcing'
71-
}
72-
const info = result.stdout.trim().split('\n');
73-
document.getElementById('kernel-release').textContent = info[0];
74-
document.getElementById('system').textContent = info[1];
75-
document.getElementById('fingerprint').textContent = info[2];
76-
document.getElementById('selinux').textContent = info[3];
77-
});
67+
export async function initInfo() {
68+
const result = await exec('uname -r && getprop ro.build.version.release && getprop ro.build.fingerprint && getenforce');
69+
if (import.meta.env.DEV) { // vite debug
70+
result.stdout = '6.18.2-linux\n16\nLinuxPC\nEnforcing';
71+
}
72+
const info = result.stdout.trim().split('\n');
73+
document.getElementById('kernel-release').textContent = info[0];
74+
document.getElementById('system').textContent = info[1];
75+
document.getElementById('fingerprint').textContent = info[2];
76+
document.getElementById('selinux').textContent = info[3];
7877
}
7978

8079
async function reboot(reason = "") {

0 commit comments

Comments
 (0)