Skip to content

Commit ee84754

Browse files
committed
fix: optimize hot install from webui
1 parent cbcb595 commit ee84754

4 files changed

Lines changed: 18 additions & 8 deletions

File tree

module/common/get_extra.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ MODPATH=${0%/*}
66
SKIPLIST="$MODPATH/tmp/skiplist"
77
XPOSED="$MODPATH/tmp/xposed"
88

9+
mkdir -p "$MODPATH/tmp"
10+
911
if [ "$MODPATH" = "/data/adb/modules/.TA_utl/common" ]; then
1012
MODDIR="/data/adb/modules/.TA_utl"
1113
MAGISK="true"

module/post-fs-data.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ fi
2323
[ "$KSU" = "true" ] && MANAGER="KSU"
2424
[ ! "$APATCH" = "true" ] && [ ! "$KSU" = "true" ] && MANAGER="MAGISK"
2525
echo "MANAGER=$MANAGER" > "$MODPATH/common/manager.sh"
26-
chmod 755 "$MODPATH/common/manager.sh"
26+
chmod 755 "$MODPATH/common/manager.sh" || true

module/service.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
MODPATH=${0%/*}
2-
PATH=/data/adb/ap/bin:/data/adb/ksu/bin:/data/adb/magisk:$PATH
2+
PATH=$PATH:/data/adb/ap/bin:/data/adb/ksu/bin:/data/adb/magisk
33
HIDE_DIR="/data/adb/modules/.TA_utl"
44
TS="/data/adb/modules/tricky_store"
55
TSPA="/data/adb/modules/tsupport-advance"
@@ -69,9 +69,6 @@ until [ "$(getprop sys.boot_completed)" = "1" ]; do
6969
sleep 1
7070
done
7171

72-
# Create temporary directory
73-
mkdir -p "$MODPATH/common/tmp"
74-
7572
sh "$MODPATH/common/get_extra.sh" --xposed >/dev/null 2>&1
7673

77-
[ -f "$MODPATH/action.sh" ] && rm -rf "/data/adb/modules/TA_utl"
74+
[ ! -f "$MODPATH/action.sh" ] || rm -rf "/data/adb/modules/TA_utl"

webui/scripts/about.js

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { linkRedirect, basePath, showPrompt } from './main.js';
22
import { getString } from './language.js';
3-
import { spawn } from 'kernelsu-alt';
3+
import { spawn, exec } from 'kernelsu-alt';
44

55
const aboutDialog = document.getElementById('about-dialog');
66
const closeAbout = document.getElementById('close-about');
@@ -49,6 +49,8 @@ document.getElementById('canary').onclick = () => {
4949

5050
// Check local version
5151
const output = spawn('sh', [`${basePath}/common/get_extra.sh`, '--check-update', `${version}`], { env: { CANARY: "true" } });
52+
output.stdout.on('data', (data) => console.log(data))
53+
output.stderr.on('data', (data) => console.log(data))
5254
output.on('exit', (code) => {
5355
if (code === 0) {
5456
showPrompt(getString("prompt_no_update"));
@@ -119,6 +121,8 @@ function downloadUpdate(link) {
119121
showPrompt(getString("prompt_downloading"), true, 20000);
120122
const download = spawn('sh', [`${basePath}/common/get_extra.sh`, '--get-update', `${link}`],
121123
{ env: { PATH: "$PATH:/data/adb/ap/bin:/data/adb/ksu/bin:/data/adb/magisk:/data/data/com.termux/files/usr/bin" } });
124+
download.stdout.on('data', (data) => console.log(data))
125+
download.stderr.on('data', (data) => console.log(data))
122126
download.on('exit', (code) => {
123127
if (code === 0) {
124128
installUpdate();
@@ -135,17 +139,24 @@ function downloadUpdate(link) {
135139
*/
136140
function installUpdate() {
137141
showPrompt(getString("prompt_installing"));
142+
let stdout = "";
138143
const output = spawn('sh', [`${basePath}/common/get_extra.sh`, '--install-update'],
139144
{ env: { PATH: "$PATH:/data/adb/ap/bin:/data/adb/ksu/bin:/data/adb/magisk" } });
145+
output.stdout.on('data', (data) => stdout += data);
140146
output.stderr.on('data', (data) => {
141147
console.error('Error during installation:', data);
142148
});
143149
output.on('exit', (code) => {
150+
if (stdout.includes('No need to reboot')) {
151+
exec(`rm -f ${basePath}/module.prop`).then(() => {
152+
window.location.reload();
153+
});
154+
}
144155
if (code === 0) {
145156
showPrompt(getString("prompt_installed"));
146157
} else {
147158
showPrompt(getString("prompt_install_fail"), false);
148159
}
149160
isDownloading = false;
150161
});
151-
}
162+
}

0 commit comments

Comments
 (0)