update aria2

aria2/aria2/install.sh

@@ -1,10 +1,10 @@
 #! /bin/sh
 cd /tmp
-cp -rf /tmp/aria2/bin/* /jffs/softcenter/
+cp -rf /tmp/aria2/bin/* /jffs/softcenter/bin/*
 cp -rf /tmp/aria2/res/* /jffs/softcenter/res/
 cp -rf /tmp/aria2/scripts/* /jffs/softcenter/scripts/
 cp -rf /tmp/aria2/webs/* /jffs/softcenter/webs/
-cp -rf /tmp/aria2/perp/aria2 /jffs/softcenter/perp/
+cp -rf /tmp/aria2/perp/* /jffs/softcenter/perp/
 cp -rf /tmp/aria2/uninstall.sh /jffs/softcenter/scripts/uninstall_aria2.sh
 rm -rf /tmp/aria2* >/dev/null 2>&1
 
@@ -12,7 +12,7 @@ if [ ! -f /jffs/softcenter/bin/aria2.session ];then
 	touch /jffs/softcenter/bin/aria2.session
 fi
 
-chmod 755 /jffs/softcenter/bin/aria2
+chmod 755 /jffs/softcenter/bin/aria2c
 chmod 755 /jffs/softcenter/init.d/*
 chmod 755 /jffs/softcenter/scripts/aria2*
 chmod 755 /jffs/softcenter/perp/aria2/*

aria2/aria2/scripts/aria2_run.sh

@@ -19,7 +19,7 @@ dbus set aria2_warning=""
 
 echo ""
 echo "#############################################################"
-printf "%0s%50s%10s\n" "#" "Aria2c Auto config Script for Merlin ARM" "#"
+printf "%0s%50s%10s\n" "#" "Aria2c Auto config Script for Merlin mips" "#"
 printf "%0s%37s%23s\n" "#" "Website: http://jffs/softcenter.cn" "#"
 printf "%0s%46s%14s\n" "#" "Author: sadoneli <sadoneli@gmail.com>" "#"
 echo "#############################################################"
@@ -27,12 +27,12 @@ echo ""
 
 # start aria2c
 creat_conf(){
-cat > /jffs/softcenter/aria2/aria2.conf <<EOF
+cat > /jffs/softcenter/etc/aria2.conf <<EOF
 `dbus list aria2 | grep -vw aria2_enable | grep -vw aria2_ddnsto | grep -vw aria2_binary| grep -vw aria2_binary_custom | grep -vw aria2_check | grep -vw aria2_check_time | grep -vw aria2_sleep | grep -vw aria2_update_enable| grep -vw aria2_update_sel | grep -vw aria2_version | grep -vw aria2_cpulimit_enable | grep -vw aria2_cpulimit_value| grep -vw aria2_version_web | grep -vw aria2_warning | grep -vw aria2_custom | grep -vw aria2_install_status|grep -vw aria2_restart |grep -vw aria2_dir| sed 's/aria2_//g' | sed 's/_/-/g'`
 `dbus list aria2|grep -w aria2_dir|sed 's/aria2_//g'`
 EOF
 
-cat >> /jffs/softcenter/aria2/aria2.conf <<EOF
+cat >> /jffs/softcenter/etc/aria2.conf <<EOF
 `dbus list aria2|grep -w aria2_custom|sed 's/aria2_custom=//g'|sed 's/,/\n/g'`
 EOF
 

aria2/aria2/scripts/aria2_status.sh

@@ -1,8 +1,8 @@
 #! /bin/sh
 source /jffs/softcenter/scripts/base.sh
-aria2_status=`ps | grep -w /jffs/softcenter/aria2/aria2c | grep -cv grep`
-aria2_pid=`ps | grep -w /jffs/softcenter/aria2/aria2c | grep -v grep | awk '{print $1}'`
-aria2_version=`/jffs/softcenter/aria2/aria2c --version | head -n 1`
+aria2_status=`ps | grep -w /jffs/softcenter/bin/aria2c | grep -cv grep`
+aria2_pid=`ps | grep -w /jffs/softcenter/bin/aria2c | grep -v grep | awk '{print $1}'`
+aria2_version=`/jffs/softcenter/bin/aria2c --version | head -n 1`
 if [ "$aria2_status"x = "1"x ];then
     echo 进程运行正常！${aria2_version}（PID：$aria2_pid） > /tmp/.aria2.log
 else

aria2/aria2/webs/Module_aria2.asp

@@ -109,7 +109,7 @@ function menu_hook(title, tab) {
   tabtitle[tabtitle.length -1] = new Array("", "aria2");
   tablink[tablink.length -1] = new Array("", "Module_aria2.asp");
 }
-function done_validating() {
+function done_validating(action) {
   return true;
 }
 function check_ddnsto() {
@@ -226,12 +226,11 @@ function onSubmitCtrl(o, s) {
   if (validForm()) {
     document.aria2_form.action_mode.value = s;
     showLoading(5);
+    refreshpage(10);
     document.aria2_form.submit();
   }
 }
-function done_validating(action) { //提交操作5秒后刷洗网页
-    refreshpage(5);
-}
+
 function conf2obj() {
   var params1 = ["aria2_cpulimit_value", "aria2_bt_tracker", "aria2_bt_max_peers", "aria2_custom", "aria2_dht_listen_port", "aria2_dir", "aria2_disk_cache", "aria2_enable", "aria2_event_poll", "aria2_file_allocation", "aria2_force_save", "aria2_install_status", "aria2_listen_port", "aria2_lowest_speed_limit", "aria2_max_concurrent_downloads", "aria2_max_connection_per_server", "aria2_max_download_limit", "aria2_max_overall_download_limit", "aria2_max_overall_upload_limit", "aria2_max_tries", "aria2_max_upload_limit", "aria2_min_split_size", "aria2_peer_id_prefix", "aria2_referer", "aria2_retry_wait", "aria2_rpc_listen_port", "aria2_rpc_secret", "aria2_save_session_interval", "aria2_seed_ratio", "aria2_sleep", "aria2_split", "aria2_user_agent"];
   for (var i = 0; i < params1.length; i++) {
@@ -264,13 +263,14 @@ function load_default_value(o, s) {
   if (validForm()) {
     document.aria2_form.action_mode.value = s;
     showLoading(5);
+    refreshpage(10);
     document.aria2_form.submit();
     update_visibility();
   }
 }
 function version_check() {
   $.ajax({
-    url: 'https://koolshare.ngrok.wang/aria2/config.json.js',
+    url: 'http://sc.paldier.com/aria2/config.json.js',
     type: 'GET',
     dataType: 'jsonp',
     success: function(res) {
@@ -286,7 +286,7 @@ function version_check() {
 }
 function get_status() {
   $.ajax({
-    url: 'apply.cgi?current_page=Module_aria2.asp&next_page=Module_aria2.asp&group_id=&modified=0&action_mode=+Refresh+&action_script=aria2_status.sh&action_wait=&first_time=&preferred_lang=CN',
+    url: 'applydb.cgi?current_page=Module_aria2.asp&next_page=Module_aria2.asp&group_id=&modified=0&action_mode=+Refresh+&action_script=aria2_status.sh&action_wait=&first_time=&preferred_lang=CN',
     dataType: 'html',
     error: function(xhr) {
       alert("error");
@@ -552,7 +552,8 @@ function initial_dir() {
 function initial_dir_status(data) {
   if (data != "" && data.length != 2) {
     get_layer_items("0");
-    eval("var default_dir=" + data);
+    //eval('var default_dir=' + data);
+    var default_dir=  data;
   } else {
     //document.getElementById("EditExports").style.display = "none";
     disk_flag = 1;
@@ -1554,7 +1555,7 @@ function toggle_func() {
                               <label>&nbsp;&nbsp;&nbsp;&nbsp;下载的URIs 文件</label>
                             </td>
                             <td>
-                              <input type="text" class="input_ss_table" style="width:auto;" name="aria2_input_file" value="/koolshare/aria2/aria2.session" maxlength="50" size="50" id="aria2_input_file">
+                              <input type="text" class="input_ss_table" style="width:auto;" name="aria2_input_file" value="/jffs/softcenter/bin/aria2.session" maxlength="50" size="50" id="aria2_input_file">
                             </td>
                           </tr>
                           <tr id="aria2_save_session_tr">
@@ -1562,7 +1563,7 @@ function toggle_func() {
                               <label>&nbsp;&nbsp;&nbsp;&nbsp;会话session保存文件</label>
                             </td>
                             <td>
-                              <input type="text" class="input_ss_table" style="width:auto;" name="aria2_save_session" value="/koolshare/aria2/aria2.session" maxlength="50" size="50" id="aria2_save_session">
+                              <input type="text" class="input_ss_table" style="width:auto;" name="aria2_save_session" value="/jffs/softcenter/bin/aria2.session" maxlength="50" size="50" id="aria2_save_session">
                             </td>
                           </tr>
                           <tr>
@@ -1612,6 +1613,7 @@ function toggle_func() {
                           </a>
                           <br/>后台技术支持： <i>Xiaobao</i>
                           <br/>Shell, Web by： <i>fw867</i>
+                          <br/>修改： <i>paldier</i>
                           <br/>
                         </div>
                       </td>

aria2/config.json.js

@@ -1,8 +1,8 @@
 {
 "version":"2.4",
-"md5":"cdd0a74446c977528b6c0bd39f6d85bb",
+"md5":"f4e5e3027db9cafbddd77b4f649f8b64",
 "home_url":"Module_aria2.asp",
 "title":"Aria2",
 "description":"linux下载利器",
-"build_date":"2019-01-13_14:31:33"
+"build_date":"2019-01-13_18:35:15"
 }

aria2/version

@@ -1,2 +1,2 @@
 2.4
-cdd0a74446c977528b6c0bd39f6d85bb
+f4e5e3027db9cafbddd77b4f649f8b64

softcenter/app.json.js

@@ -41,10 +41,10 @@
             "version": "0.3.6"
         }, 
         {
-            "build_date": "2019-01-13_14:31:33", 
+            "build_date": "2019-01-13_18:35:15", 
             "description": "linux下载利器", 
             "home_url": "Module_aria2.asp", 
-            "md5": "cdd0a74446c977528b6c0bd39f6d85bb", 
+            "md5": "f4e5e3027db9cafbddd77b4f649f8b64", 
             "name": "aria2", 
             "tar_url": "aria2/aria2.tar.gz", 
             "title": "Aria2", 
@@ -72,7 +72,7 @@
         }
     ], 
     "home_url": "https://raw.githubusercontent.com/paldier/softcenter/master", 
-    "md5": "ad166b845c7885b7c5a18f2ce6514886", 
+    "md5": "2fcb8ccf6c0a97c160df7d6fa3e32929", 
     "tar_url": "softcenter/softcenter.tar.gz", 
     "version": "1.1.6"
 }

softcenter/config.json.js

@@ -1,4 +1,4 @@
 {
 "version":"1.1.6",
-"md5":"ad166b845c7885b7c5a18f2ce6514886"
+"md5":"2fcb8ccf6c0a97c160df7d6fa3e32929"
 }

softcenter/version

@@ -1,2 +1,2 @@
 1.1.6
-ad166b845c7885b7c5a18f2ce6514886
+2fcb8ccf6c0a97c160df7d6fa3e32929