From e922f4a7783345846496e6d918d4d17330656181 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E7=A6=BB?=
 <30458572+XiaoliChan@users.noreply.github.com>
Date: Thu, 11 Feb 2021 09:18:04 +0800
Subject: [PATCH] luci-app-jd-dailybonus: Keep up to date from jerrykuku
 (#6350)

Fix issues:
- Fix permission denied
- Fix html tag mismatch in openwrt theme
---
 .../luasrc/controller/jd-dailybonus.lua                     | 6 +++---
 .../luasrc/view/jd-dailybonus/cookie_tools.htm              | 4 ++--
 .../luasrc/view/jd-dailybonus/update_service.htm            | 6 ++----
 .../luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus    | 2 +-
 .../root/usr/share/jd-dailybonus/newapp.sh                  | 4 ++--
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/package/lean/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua b/package/lean/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua
index e31f65808..356bee25f 100644
--- a/package/lean/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua
+++ b/package/lean/luci-app-jd-dailybonus/luasrc/controller/jd-dailybonus.lua
@@ -22,7 +22,7 @@ end
 function run()
     local running = luci.sys.call("busybox ps -w | grep JD_DailyBonus.js | grep -v grep >/dev/null") == 0
     if not running then
-        luci.sys.call('/usr/share/jd-dailybonus/newapp.sh -r')
+        luci.sys.call('sh /usr/share/jd-dailybonus/newapp.sh -r')
     end
     luci.http.write('')
 end
@@ -31,7 +31,7 @@ end
 function check_update()
     local jd = 'jd-dailybonus'
     local e = {}
-    local new_version = luci.sys.exec('/usr/share/jd-dailybonus/newapp.sh -n')
+    local new_version = luci.sys.exec('sh /usr/share/jd-dailybonus/newapp.sh -n')
     e.new_version = new_version
     e.error = 0
     luci.http.prepare_content('application/json')
@@ -45,7 +45,7 @@ function update()
     local uci = luci.model.uci.cursor()
     local version = luci.http.formvalue('version')
     --下载脚本
-    local code = luci.sys.exec('/usr/share/jd-dailybonus/newapp.sh -u')
+    local code = luci.sys.exec('sh /usr/share/jd-dailybonus/newapp.sh -u')
     e.error = code
     luci.http.prepare_content('application/json')
     luci.http.write_json(e)
diff --git a/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm b/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm
index 8690dee1b..705dde927 100644
--- a/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm
+++ b/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/cookie_tools.htm
@@ -70,9 +70,9 @@
 <div class="cbi-value-field">
     <input type="button" data-rel="1" class="cbi-button cbi-input-reload cookie-button" value="<%= translate('获取第一Cookie') %>" />
     <input type="button" data-rel="2" class="cbi-button cbi-input-reload cookie-button" value="<%= translate('获取第二Cookie') %>" />
-    <br>
+    <br />
     <div class="cbi-value-description">
-        <span class="cbi-value-helpicon"><img src="/luci-static/resources/cbi/help.gif" alt="帮助"></span>
+        <span class="cbi-value-helpicon"><img src="/luci-static/resources/cbi/help.gif" alt="帮助" /></span>
         <%= translate("点击上面按钮使用京东手机app扫码获取Cookie")%>
     </div>
 </div>
diff --git a/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm b/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm
index e2e32ed8e..70e7ef672 100644
--- a/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm
+++ b/package/lean/luci-app-jd-dailybonus/luasrc/view/jd-dailybonus/update_service.htm
@@ -1,14 +1,12 @@
 <%+cbi/valueheader%>
 <label class="cbi-value-title"><%= translate("执行") %></label>
 <div class="cbi-value-field">
-    <input class="cbi-button cbi-button-reload" id="update_service" type="button" size="0" onclick="run()"
-        value="<%= translate("手动执行签到") %>">
+    <input class="cbi-button cbi-button-reload" id="update_service" type="button" size="0" onclick="run()" value="<%= translate('手动执行签到') %>" />
 </div>
 
 <label class="cbi-value-title"><%= translate("更新脚本") %></label>
 <div class="cbi-value-field">
-    <input class="cbi-button cbi-button-reload" id="update_script" type="button" size="0" onclick="check_version()" data-version="<%= self.version %>"
-        value="<%= translate("手动检查脚本更新，当前版本：v")..self.version %>">
+    <input class="cbi-button cbi-button-reload" id="update_script" type="button" size="0" onclick="check_version()" data-version="<%= self.version %>" value="<%= translate('手动检查脚本更新，当前版本：v')..self.version %>" />
 </div>
 
 <script type="text/javascript">
diff --git a/package/lean/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus b/package/lean/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus
index 211e4837e..46af8dcbc 100755
--- a/package/lean/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus
+++ b/package/lean/luci-app-jd-dailybonus/root/etc/init.d/jd-dailybonus
@@ -19,7 +19,7 @@ del_cron() {
 }
 
 start_service(){
-	/usr/share/jd-dailybonus/newapp.sh -s
+	sh /usr/share/jd-dailybonus/newapp.sh -s
 }
 
 stop_service() {
diff --git a/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh b/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh
index 91a7f3fc7..1dddea94c 100755
--- a/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh
+++ b/package/lean/luci-app-jd-dailybonus/root/usr/share/jd-dailybonus/newapp.sh
@@ -51,8 +51,8 @@ cancel() {
 
 add_cron() {
     sed -i '/jd-dailybonus/d' $CRON_FILE
-    [ $(uci_get_by_type global auto_run 0) -eq 1 ] && echo $(uci_get_by_type global auto_run_time_m)' '$(uci_get_by_type global auto_run_time_h)' * * * /usr/share/jd-dailybonus/newapp.sh -w' >>$CRON_FILE
-    [ $(uci_get_by_type global auto_update 0) -eq 1 ] && echo '1 '$(uci_get_by_type global auto_update_time)' * * * /usr/share/jd-dailybonus/newapp.sh -u' >>$CRON_FILE
+    [ $(uci_get_by_type global auto_run 0) -eq 1 ] && echo $(uci_get_by_type global auto_run_time_m)' '$(uci_get_by_type global auto_run_time_h)' * * * sh /usr/share/jd-dailybonus/newapp.sh -w' >>$CRON_FILE
+    [ $(uci_get_by_type global auto_update 0) -eq 1 ] && echo '1 '$(uci_get_by_type global auto_update_time)' * * * sh /usr/share/jd-dailybonus/newapp.sh -u' >>$CRON_FILE
     crontab $CRON_FILE
     /etc/init.d/cron restart
 }