update voipblock install script, fix changing modgui options freeze n…

…ginx
Ansuel · Sep 20, 2021 · 5b4ef7f · 5b4ef7f
1 parent 4d4770e
commit 5b4ef7f
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 16 deletions.
diff --git a/decompressed/gui_file/usr/share/transformer/commitapply/uci_modgui.ca b/decompressed/gui_file/usr/share/transformer/commitapply/uci_modgui.ca
@@ -1,4 +1,4 @@
 ^modgui%..+%.autoupgrade /usr/share/transformer/scripts/upgradegui SetTime
 ^modgui%..+%.autoupgrade_hour /usr/share/transformer/scripts/upgradegui SetTime
 ^modgui%.var%.isp /usr/share/transformer/scripts/ispConfighelper.sh force
-^versioncusto /etc/init.d/transformer restart
+^versioncusto /etc/init.d/transformer reload
diff --git a/decompressed/gui_file/usr/share/transformer/scripts/appInstallRemoveUtility.sh b/decompressed/gui_file/usr/share/transformer/scripts/appInstallRemoveUtility.sh
@@ -401,14 +401,16 @@ app_aria2() {
 
 app_voipblock_for_mmpbx() {
   install() {
-    curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_install_for_mmpbx
-    uci set modgui.app.voipblock_for_mmpbx="1"
-    uci commit modgui
+    curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_install_for_mmpbx && {
+      uci set modgui.app.voipblock_for_mmpbx="1"
+      uci commit modgui
+    }
   }
   remove() {
-    curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_uninstall_for_mmpbx
-    uci set modgui.app.voipblock_for_mmpbx="0"
-    uci commit modgui
+    curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_uninstall_for_mmpbx && {
+      uci set modgui.app.voipblock_for_mmpbx="0"
+      uci commit modgui
+    }
   }
 
   case $1 in
@@ -427,19 +429,17 @@ app_voipblock_for_mmpbx() {
 
 app_voipblock_for_asterisk() {
   install() {
-    [ "$(uci get -q modgui.app.blacklist_app)" = "1" ] && {
-      curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_switch_to_voipblock
+    curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_install_for_asterisk && {
       uci set modgui.app.blacklist_app="0"
-    } || {
-      curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_install_for_asterisk
+      uci set modgui.app.voipblock_for_asterisk="1"
+      uci commit modgui
     }
-    uci set modgui.app.voipblock_for_asterisk="1"
-    uci commit modgui
   }
   remove() {
-    curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_uninstall_for_asterisk
-    uci set modgui.app.voipblock_for_asterisk="0"
-    uci commit modgui
+    curl -s https://repository.macoers.com/voipblock/voipblock.sh | ash -s tch_uninstall_for_asterisk && {
+      uci set modgui.app.voipblock_for_asterisk="0"
+      uci commit modgui
+    }
   }
 
   case $1 in