From eae9bcca30e547536213bef7ffc30712ad92552d Mon Sep 17 00:00:00 2001
From: janson <janson@gmail.com>
Date: Mon, 23 Jan 2023 10:00:56 +0800
Subject: [PATCH] add istore-reinstall and disable-wandrop

---
 applications/luci-app-systools/Makefile       |  2 +-
 .../luasrc/controller/systools.lua            |  2 +-
 .../root/usr/libexec/istorec/systools.sh      | 14 +++--
 .../usr/share/systools/disable-wandrop.run    |  4 ++
 .../usr/share/systools/istore-reinstall.run   | 62 +++++++++++++++++++
 5 files changed, 78 insertions(+), 6 deletions(-)
 create mode 100755 applications/luci-app-systools/root/usr/share/systools/disable-wandrop.run
 create mode 100755 applications/luci-app-systools/root/usr/share/systools/istore-reinstall.run

diff --git a/applications/luci-app-systools/Makefile b/applications/luci-app-systools/Makefile
index 6cd3ee9..32d7cb3 100644
--- a/applications/luci-app-systools/Makefile
+++ b/applications/luci-app-systools/Makefile
@@ -2,7 +2,7 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_VERSION:=1.0.1-20221121
+PKG_VERSION:=1.0.2-20230123
 PKG_RELEASE:=
 
 LUCI_TITLE:=LuCI support for SysTools
diff --git a/applications/luci-app-systools/luasrc/controller/systools.lua b/applications/luci-app-systools/luasrc/controller/systools.lua
index 8e5dd38..8d11053 100755
--- a/applications/luci-app-systools/luasrc/controller/systools.lua
+++ b/applications/luci-app-systools/luasrc/controller/systools.lua
@@ -88,7 +88,7 @@ function main_container(data, extra)
           required = true,
           title = "可执行操作",
           type = "string",
-          enum = {"turn_off_ipv6", "reset_rom_pkgs", "qb_reset_password", "disk_power_mode", "speedtest", "openssl-aes256gcm", "openssl-chacha20-poly1305"},
+          enum = {"turn_off_ipv6", "reset_rom_pkgs", "qb_reset_password", "disk_power_mode", "speedtest", "openssl-aes256gcm", "openssl-chacha20-poly1305", "istore-reinstall", "disable-wandrop"},
           enumNames = {
             lng.translate("Turn off IPv6"), 
             lng.translate("Reset rom pkgs"), 
diff --git a/applications/luci-app-systools/root/usr/libexec/istorec/systools.sh b/applications/luci-app-systools/root/usr/libexec/istorec/systools.sh
index 91d6f9f..415c697 100755
--- a/applications/luci-app-systools/root/usr/libexec/istorec/systools.sh
+++ b/applications/luci-app-systools/root/usr/libexec/istorec/systools.sh
@@ -16,16 +16,16 @@ usage() {
 
 case ${ACTION} in
   "turn_off_ipv6")
-    /usr/share/systools/turn_off_ipv6.run
+    bash "/usr/share/systools/${ACTION}.run"
   ;;
   "reset_rom_pkgs")
-    /usr/share/systools/reset_rom_pkgs.run
+    bash "/usr/share/systools/${ACTION}.run"
   ;;
   "qb_reset_password")
-    /usr/share/systools/qb_reset_password.run
+    bash "/usr/share/systools/${ACTION}.run"
   ;;
   "disk_power_mode")
-    /usr/share/systools/disk_power_mode.run
+    bash "/usr/share/systools/${ACTION}.run"
   ;;
   "speedtest")
     /usr/share/systools/speedtest.run ${1}
@@ -36,6 +36,12 @@ case ${ACTION} in
   "openssl-chacha20-poly1305")
     bash "/usr/share/systools/${ACTION}.run"
   ;;
+  "istore-reinstall")
+    bash "/usr/share/systools/${ACTION}.run"
+  ;;
+  "disable-wandrop")
+    bash "/usr/share/systools/${ACTION}.run"
+  ;;
   *)
     usage
     exit 1
diff --git a/applications/luci-app-systools/root/usr/share/systools/disable-wandrop.run b/applications/luci-app-systools/root/usr/share/systools/disable-wandrop.run
new file mode 100755
index 0000000..91c3af9
--- /dev/null
+++ b/applications/luci-app-systools/root/usr/share/systools/disable-wandrop.run
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+/etc/init.d/wan_drop disable
+
diff --git a/applications/luci-app-systools/root/usr/share/systools/istore-reinstall.run b/applications/luci-app-systools/root/usr/share/systools/istore-reinstall.run
new file mode 100755
index 0000000..8f21c91
--- /dev/null
+++ b/applications/luci-app-systools/root/usr/share/systools/istore-reinstall.run
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+version="1.0"
+APP_URL='https://istore.linkease.com/repo/all/store'
+luci_store=luci-app-store_0.1.12-9_all.ipk
+luci_taskd=luci-lib-taskd_1.0.17_all.ipk
+xterm=luci-lib-xterm_4.18.0_all.ipk
+task=taskd_1.0.3-1_all.ipk
+
+setup_color() {
+    # Only use colors if connected to a terminal
+    if [ -t 1 ]; then
+        RED=$(printf '\033[31m')
+        GREEN=$(printf '\033[32m')
+        YELLOW=$(printf '\033[33m')
+        BLUE=$(printf '\033[34m')
+        BOLD=$(printf '\033[1m')
+        RESET=$(printf '\033[m')
+    else
+        RED=""
+        GREEN=""
+        YELLOW=""
+        BLUE=""
+        BOLD=""
+        RESET=""
+    fi
+}
+setup_color
+command_exists() {
+    command -v "$@" >/dev/null 2>&1
+}
+error() {
+    echo ${RED}"Error: $@"${RESET} >&2
+}
+
+Download_Files(){
+  local URL=$1
+  local FileName=$2
+  if command_exists curl; then
+    curl -sSLk ${URL} -o ${FileName}
+  elif command_exists wget; then
+    wget -c --no-check-certificate ${URL} -O ${FileName}
+  fi
+}
+
+clean_app(){
+    rm -f /tmp/${luci_store} /tmp/${luci_taskd} /tmp/${xterm} /tmp/${task}
+}
+
+command_exists opkg || {
+    error "The program only supports Openwrt."
+    clean_app
+    exit 1
+}
+
+( set -x; Download_Files ${APP_URL}/${luci_store} /tmp/${luci_store};
+  Download_Files ${APP_URL}/${luci_taskd} /tmp/${luci_taskd};
+  Download_Files ${APP_URL}/${task} /tmp/${task};
+  Download_Files ${APP_URL}/${xterm} /tmp/${xterm}; )
+  
+opkg install --force-reinstall /tmp/${task} /tmp/${xterm} /tmp/${luci_taskd} /tmp/${luci_store}
+