update reboothelper

iranee · Mar 9, 2020 · ec37ffa · ec37ffa
1 parent c422bb2
commit ec37ffa
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/reboothelper/build.sh b/reboothelper/build.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 MODULE="reboothelper"
-VERSION="0.3"
+VERSION="0.4"
 TITLE="重启助手"
 DESCRIPTION="解决重启Bug"
 HOME_URL="Module_reboothelper.asp"

diff --git a/reboothelper/config.json.js b/reboothelper/config.json.js
@@ -1,9 +1,9 @@
 {
-"version":"0.3",
-"md5":"a3c0ae802e463966fedb887a3cc14571",
+"version":"0.4",
+"md5":"18efa712bc58a5ab1313475c9c261222",
 "home_url":"Module_reboothelper.asp",
 "title":"重启助手",
 "description":"解决重启Bug",
 "changelog":"",
-"build_date":"2020-03-09_16:49:21"
+"build_date":"2020-03-09_16:57:16"
 }
diff --git a/reboothelper/reboothelper.tar.gz b/reboothelper/reboothelper.tar.gz
diff --git a/reboothelper/reboothelper/scripts/reboothelper_config.sh b/reboothelper/reboothelper/scripts/reboothelper_config.sh
@@ -1,19 +1,20 @@
 #!/bin/sh
 
 source /koolshare/scripts/base.sh
-eval `dbus export reboothelper`
+eval $(dbus export reboothelper)
 
 create_Cron(){
 	cru a reboothelper_schedule "$reboothelper_minute $reboothelper_hour $reboothelper_day * $reboothelper_week echo b > /proc/sysrq-trigger"
 	[ ! -L "/koolshare/init.d/S99Reboothelper.sh" ] && ln -sf /koolshare/scripts/reboothelper_config.sh /koolshare/init.d/S99Reboothelper.sh
 }
 
 delete_Cron(){
-	jobexist=`cru l | grep reboothelper_schedule`
+	jobexist=$(cru l | grep reboothelper_schedule)
 	# kill crontab job
 	[ -n "$jobexist" ] && cru d reboothelper_schedule
 }
 
+# 开机启动
 case $1 in
 start)
 	if [ "$reboothelper_enable" == "1" ];then
@@ -24,7 +25,11 @@ start)
 stop)
 	delete_Cron
 	;;
-2)
+esac
+
+# web控制
+case $2 in
+1)
 	if [ "$reboothelper_enable" == "1" ];then
 		logger "[软件中心]: 添加自动重启任务"
 		create_Cron

diff --git a/reboothelper/reboothelper/version b/reboothelper/reboothelper/version
@@ -1 +1 @@
-0.3
+0.4
diff --git a/reboothelper/reboothelper/webs/Module_reboothelper.asp b/reboothelper/reboothelper/webs/Module_reboothelper.asp
@@ -124,8 +124,8 @@
                 }
             });
 
-            showLoading(5);
-            refreshpage(5);
+            showLoading(2);
+            refreshpage(2);
 
 
             var id = parseInt(Math.random() * 100000000);

diff --git a/reboothelper/version b/reboothelper/version
@@ -1,2 +1,2 @@
-0.3
-a3c0ae802e463966fedb887a3cc14571
+0.4
+18efa712bc58a5ab1313475c9c261222
diff --git a/softcenter/app.json.js b/softcenter/app.json.js
@@ -177,15 +177,15 @@
             "version": "2.0"
         }, 
         {
-            "build_date": "2020-03-09_16:49:21", 
+            "build_date": "2020-03-09_16:57:16", 
             "changelog": "", 
             "description": "解决重启Bug", 
             "home_url": "Module_reboothelper.asp", 
-            "md5": "a3c0ae802e463966fedb887a3cc14571", 
+            "md5": "18efa712bc58a5ab1313475c9c261222", 
             "name": "reboothelper", 
             "tar_url": "reboothelper/reboothelper.tar.gz", 
             "title": "重启助手", 
-            "version": "0.3"
+            "version": "0.4"
         }, 
         {
             "build_date": "2020-01-03_14:30:52",