diff --git a/softcenter/app.json.js b/softcenter/app.json.js index 0bc3614..e822e33 100644 --- a/softcenter/app.json.js +++ b/softcenter/app.json.js @@ -11,10 +11,10 @@ "version": "0.2.3" }, { - "build_date": "2019-01-12_19:22:11", + "build_date": "2019-01-13_21:09:08", "description": "老板,来一斤虚拟内存~", "home_url": "Module_swap.asp", - "md5": "4ea389360d37f7ff9d2d4046b43be59b", + "md5": "3cd29e9307ca957e78c258ad693ae640", "name": "swap", "tar_url": "swap/swap.tar.gz", "title": "虚拟内存", @@ -72,7 +72,7 @@ } ], "home_url": "https://raw.githubusercontent.com/paldier/softcenter/master", - "md5": "ad50bc75f8a05449e8d65d03216be3db", + "md5": "55442664d9e425f5ce6a2a0375200c4d", "tar_url": "softcenter/softcenter.tar.gz", "version": "1.1.6" } \ No newline at end of file diff --git a/softcenter/config.json.js b/softcenter/config.json.js index e446c77..3912110 100644 --- a/softcenter/config.json.js +++ b/softcenter/config.json.js @@ -1,4 +1,4 @@ { "version":"1.1.6", -"md5":"ad50bc75f8a05449e8d65d03216be3db" +"md5":"55442664d9e425f5ce6a2a0375200c4d" } diff --git a/softcenter/softcenter.tar.gz b/softcenter/softcenter.tar.gz index a73ccd3..cbf29e8 100644 Binary files a/softcenter/softcenter.tar.gz and b/softcenter/softcenter.tar.gz differ diff --git a/softcenter/version b/softcenter/version index 39672fc..428a71d 100644 --- a/softcenter/version +++ b/softcenter/version @@ -1,2 +1,2 @@ 1.1.6 -ad50bc75f8a05449e8d65d03216be3db +55442664d9e425f5ce6a2a0375200c4d diff --git a/swap/config.json.js b/swap/config.json.js index e9f1946..39b4114 100644 --- a/swap/config.json.js +++ b/swap/config.json.js @@ -1,8 +1,8 @@ { "version":"2.2", -"md5":"4ea389360d37f7ff9d2d4046b43be59b", +"md5":"3cd29e9307ca957e78c258ad693ae640", "home_url":"Module_swap.asp", "title":"虚拟内存", "description":"老板,来一斤虚拟内存~", -"build_date":"2019-01-12_19:22:11" +"build_date":"2019-01-13_21:09:08" } diff --git a/swap/swap.tar.gz b/swap/swap.tar.gz index 9867c2a..79d1efb 100644 Binary files a/swap/swap.tar.gz and b/swap/swap.tar.gz differ diff --git a/swap/swap/scripts/swap_startup.sh b/swap/swap/scripts/swap_startup.sh index dd3671c..83aa33e 100755 --- a/swap/swap/scripts/swap_startup.sh +++ b/swap/swap/scripts/swap_startup.sh @@ -11,4 +11,4 @@ then swapon $usb_disk/swapswapfile else echo -e "Swap file not found or $usb_disk is not mounted..." -fi \ No newline at end of file +fi diff --git a/swap/swap/swap/swap.sh b/swap/swap/swap/swap.sh index 1de0b79..f171571 100755 --- a/swap/swap/swap/swap.sh +++ b/swap/swap/swap/swap.sh @@ -1,11 +1,10 @@ #! /bin/sh # ====================================变量定义==================================== # 版本号定义 -version="1.8" +version="2.2" dbus set swap_version="$version" # 导入skipd数据 eval `dbus export swap` - # 引用环境变量等 source /jffs/softcenter/scripts/base.sh @@ -30,7 +29,7 @@ if [ "$swapon" == "0" ];then swapon "$usb_disk"/swapfile dbus set swap_warnning="4" else - if [ "$ext_type" == "ext2" ] || [ "$ext_type" == "ext3" ] || [ "$ext_type" == "ext4" ];then + if [ "$ext_type" == "ext2" ] || [ "$ext_type" == "ext3" ] || [ "$ext_type" == "ext4" ] || [ "$ext_type" == "tfat" ] || [ "$ext_type" == "tntfs" ] || [ "$ext_type" == "vfat" ];then dbus set swap_warnning="3" else dbus set swap_warnning="2" diff --git a/swap/swap/webs/Module_swap.asp b/swap/swap/webs/Module_swap.asp index f26cad4..25db318 100644 --- a/swap/swap/webs/Module_swap.asp +++ b/swap/swap/webs/Module_swap.asp @@ -218,8 +218,8 @@ function reload_Soft_Center(){ location.href = "/Main_Soft_center.asp"; } function menu_hook(title, tab) { - tabtitle[tabtitle.length -1] = new Array("", "speedtest"); - tablink[tablink.length -1] = new Array("", "Module_speedtest.asp"); + tabtitle[tabtitle.length -1] = new Array("", "虚拟内存"); + tablink[tablink.length -1] = new Array("", "Module_swap.asp"); } @@ -275,7 +275,7 @@ function menu_hook(title, tab) {