Skip to content

Commit 5b4ef7f

Browse files
committed
update voipblock install script, fix changing modgui options freeze nginx
1 parent 4d4770e commit 5b4ef7f

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
^modgui%..+%.autoupgrade /usr/share/transformer/scripts/upgradegui SetTime
22
^modgui%..+%.autoupgrade_hour /usr/share/transformer/scripts/upgradegui SetTime
33
^modgui%.var%.isp /usr/share/transformer/scripts/ispConfighelper.sh force
4-
^versioncusto /etc/init.d/transformer restart
4+
^versioncusto /etc/init.d/transformer reload

decompressed/gui_file/usr/share/transformer/scripts/appInstallRemoveUtility.sh

+15-15
Original file line numberDiff line numberDiff line change
@@ -401,14 +401,16 @@ app_aria2() {
401401

402402
app_voipblock_for_mmpbx() {
403403
install() {
404-
curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_install_for_mmpbx
405-
uci set modgui.app.voipblock_for_mmpbx="1"
406-
uci commit modgui
404+
curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_install_for_mmpbx && {
405+
uci set modgui.app.voipblock_for_mmpbx="1"
406+
uci commit modgui
407+
}
407408
}
408409
remove() {
409-
curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_uninstall_for_mmpbx
410-
uci set modgui.app.voipblock_for_mmpbx="0"
411-
uci commit modgui
410+
curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_uninstall_for_mmpbx && {
411+
uci set modgui.app.voipblock_for_mmpbx="0"
412+
uci commit modgui
413+
}
412414
}
413415

414416
case $1 in
@@ -427,19 +429,17 @@ app_voipblock_for_mmpbx() {
427429

428430
app_voipblock_for_asterisk() {
429431
install() {
430-
[ "$(uci get -q modgui.app.blacklist_app)" = "1" ] && {
431-
curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_switch_to_voipblock
432+
curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_install_for_asterisk && {
432433
uci set modgui.app.blacklist_app="0"
433-
} || {
434-
curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_install_for_asterisk
434+
uci set modgui.app.voipblock_for_asterisk="1"
435+
uci commit modgui
435436
}
436-
uci set modgui.app.voipblock_for_asterisk="1"
437-
uci commit modgui
438437
}
439438
remove() {
440-
curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_uninstall_for_asterisk
441-
uci set modgui.app.voipblock_for_asterisk="0"
442-
uci commit modgui
439+
curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_uninstall_for_asterisk && {
440+
uci set modgui.app.voipblock_for_asterisk="0"
441+
uci commit modgui
442+
}
443443
}
444444

445445
case $1 in

0 commit comments

Comments
 (0)