Skip to content

Commit

Permalink
update center
Browse files Browse the repository at this point in the history
  • Loading branch information
sadoneli committed Jan 30, 2022
1 parent abc927d commit 4d731da
Show file tree
Hide file tree
Showing 25 changed files with 1,466 additions and 32 deletions.
16 changes: 15 additions & 1 deletion center/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# build script for armsoft project

MODULE="center"
VERSION="1.4"
VERSION="1.5"
TITLE="软件中心一键切换"
DESCRIPTION="koolcenter/softcenter 一键来回切换!"
HOME_URL="Module_center.asp"
Expand All @@ -13,6 +13,20 @@ AUTHOR="sadog"
# Check and include base
DIR="$( cd "$( dirname "$BASH_SOURCE[0]" )" && pwd )"

# prepare, copy koolcenter necessary file
rm -rf $DIR/center/res/soft-v*

soft_folder=$(dirname $DIR/../koolcenter/softcenter/res/soft-v*/assets)

cp $DIR/../koolcenter/softcenter/webs/Module_Softcenter.asp $DIR/center/webs/Module_Softcenter_new.asp
cp -rf $soft_folder $DIR/center/res/
cp $DIR/../koolcenter/softcenter/scripts/ks_home_status.sh $DIR/center/scripts/
cp $DIR/../koolcenter/softcenter/.soft_ver $DIR/center/.soft_ver_new

cp $DIR/../softcenter/softcenter/webs/Module_Softcenter.asp $DIR/center/webs/Module_Softcenter_old.asp
cp $DIR/../softcenter/softcenter/webs/Module_Softsetting.asp $DIR/center/webs/Module_Softsetting.asp
cp $DIR/../softcenter/softcenter/.soft_ver $DIR/center/.soft_ver_old

# now include build_base.sh
. $DIR/../softcenter/build_base.sh

Expand Down
Binary file modified center/center.tar.gz
Binary file not shown.
1 change: 1 addition & 0 deletions center/center/.soft_ver_new
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.9.1.2
1 change: 1 addition & 0 deletions center/center/.soft_ver_old
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
1.2.2
88 changes: 84 additions & 4 deletions center/center/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,45 @@ get_fw_type() {
fi
}

get_ui_type(){
# default value
[ "${MODEL}" == "RT-AC86U" ] && local ROG_RTAC86U=0
[ "${MODEL}" == "GT-AC2900" ] && local ROG_GTAC2900=1
[ "${MODEL}" == "GT-AC5300" ] && local ROG_GTAC5300=1
[ "${MODEL}" == "GT-AX11000" ] && local ROG_GTAX11000=1
[ "${MODEL}" == "GT-AXE11000" ] && local ROG_GTAXE11000=1
local KS_TAG=$(nvram get extendno|grep koolshare)
local EXT_NU=$(nvram get extendno)
local EXT_NU=$(echo ${EXT_NU%_*} | grep -Eo "^[0-9]{1,10}$")
local BUILDNO=$(nvram get buildno)
[ -z "${EXT_NU}" ] && EXT_NU="0"
# RT-AC86U
if [ -n "${KS_TAG}" -a "${MODEL}" == "RT-AC86U" -a "${EXT_NU}" -lt "81918" -a "${BUILDNO}" != "386" ];then
# RT-AC86U的官改固件,在384_81918之前的固件都是ROG皮肤,384_81918及其以后的固件(包括386)为ASUSWRT皮肤
ROG_RTAC86U=1
fi
# GT-AC2900
if [ "${MODEL}" == "GT-AC2900" ] && [ "${FW_TYPE_CODE}" == "3" -o "${FW_TYPE_CODE}" == "4" ];then
# GT-AC2900从386.1开始已经支持梅林固件,其UI是ASUSWRT
ROG_GTAC2900=0
fi
# GT-AX11000
if [ "${MODEL}" == "GT-AX11000" -o "${MODEL}" == "GT-AX11000_BO4" ] && [ "${FW_TYPE_CODE}" == "3" -o "${FW_TYPE_CODE}" == "4" ];then
# GT-AX11000从386.2开始已经支持梅林固件,其UI是ASUSWRT
ROG_GTAX11000=0
fi
# ROG UI
if [ "${ROG_GTAC5300}" == "1" -o "${ROG_RTAC86U}" == "1" -o "${ROG_GTAC2900}" == "1" -o "${ROG_GTAX11000}" == "1" -o "${ROG_GTAXE11000}" == "1" ];then
# GT-AC5300、RT-AC86U部分版本、GT-AC2900部分版本、GT-AX11000部分版本、GT-AXE11000全部版本,骚红皮肤
UI_TYPE="ROG"
fi
# TUF UI
if [ "${MODEL%-*}" == "TUF" ];then
# 官改固件,橙色皮肤
UI_TYPE="TUF"
fi
}

platform_test(){
local LINUX_VER=$(uname -r|awk -F"." '{print $1$2}')
if [ -d "/koolshare" -a -f "/usr/bin/skipd" -a "${LINUX_VER}" -eq "26" ];then
Expand Down Expand Up @@ -66,6 +105,28 @@ exit_install(){
esac
}

set_kc_value(){
local SC_URL=$(nvram get sc_url)

if [ -z "${SC_URL}" ];then
local LINUX_VER=$(uname -r|awk -F"." '{print $1$2}')
if [ "${LINUX_VER}" -ge "41" ];then
nvram set sc_url=https://rogsoft.ddnsto.com
nvram commit
fi
if [ "${LINUX_VER}" -eq "26" ];then
nvram set sc_url=https://armsoft.ddnsto.com
nvram commit
fi
fi

local SC_SKN=$(nvram get sc_skin)
if [ -z "${SC_SKN}" ];then
nvram set sc_skin="${UI_TYPE}"
nvram commit
fi
}

install_now(){
# default value
CENTER_TYPE=$(cat /jffs/.koolshare/webs/Module_Softcenter.asp | grep -Eo "/softcenter/app.json.js")
Expand All @@ -78,14 +139,33 @@ install_now(){
fi
local PLVER=$(cat ${DIR}/version)

# isntall file
# set koolcenter val
set_kc_value

# install file
echo_date "安装插件相关文件..."
cd /tmp
cp -rf /tmp/${module}/res/* /koolshare/res/
cp -rf /tmp/${module}/scripts/* /koolshare/scripts/
cp -rf /tmp/${module}/webs/* /koolshare/webs/
cp -rf /tmp/${module}/res/icon-center.png /koolshare/res/
cp -rf /tmp/${module}/scripts/center_config.sh /koolshare/scripts/
cp -rf /tmp/${module}/webs/Module_center.asp /koolshare/webs/
cp -rf /tmp/${module}/uninstall.sh /koolshare/scripts/uninstall_${module}.sh

# install softcenter/koolcenter web files
if [ -z "$CENTER_TYPE" ];then
# koolcenter is use, install softcenter
cp -rf /tmp/${module}/webs/Module_Softcenter_old.asp /koolshare/webs/
cp -rf /tmp/${module}/webs/Module_Softsetting.asp /koolshare/webs/
cp -rf /tmp/${module}/.soft_ver_old /koolshare/
else
# softcenter is use, install koolcenter
soft_folder=$(dirname /tmp/${module}/res/soft-v*/assets)
rm -rf /koolshare/res/soft-v*
cp -rf /tmp/${module}/webs/Module_Softcenter_new.asp /koolshare/webs/
cp -rf $soft_folder /koolshare/res/
cp -rf /tmp/${module}/scripts/ks_home_status.sh /koolshare/scripts/
cp -rf /tmp/${module}/.soft_ver_new /koolshare/
fi

# Permissions
chmod 755 /koolshare/scripts/*.sh >/dev/null 2>&1

Expand Down
1 change: 1 addition & 0 deletions center/center/res/soft-v19/assets/index.b2655c80.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions center/center/res/soft-v19/assets/style.6e05d620.css

Large diffs are not rendered by default.

21 changes: 21 additions & 0 deletions center/center/res/soft-v19/assets/vendor.cad358c0.js

Large diffs are not rendered by default.

60 changes: 60 additions & 0 deletions center/center/scripts/ks_home_status.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/bin/sh

export KSROOT=/koolshare
source $KSROOT/scripts/base.sh

_get_model(){
local odmpid=$(nvram get odmpid)
local MODEL=$(nvram get productid)
local _tmp="unknow"
if [ -n "${odmpid}" ];then
_tmp=$(echo "${odmpid}"|tr '[A-Z]-' '[a-z]_')
else
_tmp=$(echo "${MODEL}"|tr '[A-Z]-' '[a-z]_')
fi
echo ${_tmp}
}

_get_mac(){
local MACADDR=$(nvram get et0macaddr)||"FF:FF:FF:FF:FF:FF"
local _MACMD5=$(echo $MACADDR|md5sum)
local _MACMD5=${_MACMD5% -}
echo $_MACMD5
}

get_current_jffs_status(){
local cur_patition=$(df | /bin/grep /jffs)
if [ -n "${cur_patition}" ];then
JFFS_USED=$(echo ${cur_patition} | awk '{print $3}')
JFFS_TOTAL=$(echo ${cur_patition} | awk '{print $2}')
else
JFFS_USED=0
JFFS_TOTAL=0
fi
}

eval $(dbus export ddnsto_)
DDNSTO_URL=${ddnsto_url}
if [ -z "${DDNSTO_URL}" ]; then
UQ_ID=$(_get_mac)
DDNSTO_URL=$(echo "https://asus-${UQ_ID:0:8}.kooldns.cn")
fi

DDNSTO_INSTALL=$(dbus get softcenter_module_ddnsto_install)
if [ -n "${DDNSTO_INSTALL}" ]; then
if [ ! -f "/koolshare/bin/ddnsto" ]; then
DDNSTO_INSTALL=0
fi
else
DDNSTO_INSTALL=0
fi

DDNSTO_STATUS=$(ps | grep -w ddnsto | grep -cv grep)
DDNSTO_PID=$(pidof ddnsto)

DDNSTO_DEVICE_ID=$(/koolshare/bin/ddnsto -w|cut -d ' ' -f2)

get_current_jffs_status

RESP=$(echo '{\"ddnsto_url\":\"'${DDNSTO_URL}'\",\"ddnsto_token\":\"'${ddnsto_token}'\",\"ddnsto_install\":'${DDNSTO_INSTALL}',\"ddnsto_status\":'${DDNSTO_STATUS}',\"ddnsto_device_id\":\"'${DDNSTO_DEVICE_ID}'\",\"ddnsto_pid\":\"'${DDNSTO_PID}'\",\"jffs_used\":\"'${JFFS_USED}'\",\"jffs_total\":\"'${JFFS_TOTAL}'\"}')
http_response "${RESP}"
2 changes: 1 addition & 1 deletion center/center/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.4
1.5
82 changes: 82 additions & 0 deletions center/center/webs/Module_Softcenter_new.asp
Original file line number Diff line number Diff line change
@@ -0,0 +1,82 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">

<head>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta HTTP-EQUIV="Pragma" CONTENT="no-cache" />
<meta HTTP-EQUIV="Expires" CONTENT="-1" />
<link rel="shortcut icon" href="images/favicon.png" />
<link rel="icon" href="images/favicon.png" />
<title>KoolShare - 软件中心</title>
<link rel="stylesheet" type="text/css" href="index_style.css" />
<link rel="stylesheet" type="text/css" href="form_style.css" />
<link rel="stylesheet" type="text/css" href="css/element.css">
<link rel="stylesheet" type="text/css" href="/res/softcenter.css">
<link rel="stylesheet" type="text/css" href="/res/layer/theme/default/layer.css">
<script type="text/javascript" src="/res/Browser.js"></script>
<script type="text/javascript" src="/res/softcenter.js"></script>
<script type="text/javascript" src="/state.js"></script>
<script type="text/javascript" src="/js/jquery.js"></script>
<script type="text/javascript" src="/general.js"></script>
<script type="text/javascript" src="/popup.js"></script>
<script>
var noChange_status = 0;
var _responseLen;
window.Koolshare_Software = {
EXT: '<% nvram_get("extendno"); %>',
jffs2_scripts: '<% nvram_get("jffs2_scripts"); %>',
ro_model: '<% nvram_get("odmpid"); %>' || '<% nvram_get("productid"); %>',
ro_mac_addr: '<% nvram_get("et0macaddr"); %>',
net_addr: '<% nvram_get("lan_ipaddr"); %>',
home_url: '<% nvram_get("sc_url"); %>',
skin: ('<% nvram_get("sc_skin"); %>').toUpperCase(),
}
function init() {
show_menu(menu_hook);
}
function menu_hook(title, tab) {
tabtitle[tabtitle.length - 1] = new Array("", "软件中心",);
var fileName = window.location.pathname
if (fileName[0] == "/") {
fileName = fileName.slice(1)
}
tablink[tablink.length - 1] = new Array("", fileName);
}
</script>
<!-- -->
<script type="module" crossorigin src="/res/soft-v19/assets/index.b2655c80.js"></script>
<link rel="modulepreload" href="/res/soft-v19/assets/vendor.cad358c0.js">
<link rel="stylesheet" href="/res/soft-v19/assets/style.6e05d620.css">
<!-- -->
</head>

<body onload="init();">
<div id="TopBanner"></div>
<div id="Loading" class="popup_bg"></div>
<table class="content" align="center" cellpadding="0" cellspacing="0">
<tr>
<td width="17">&nbsp;</td>
<td valign="top" width="202">
<div id="mainMenu"></div>
<div id="subMenu"></div>
</td>
<td valign="top">
<div id="tabMenu" class="submenuBlock"></div>
<table width="100%" style="width: calc( 100% - 6px);" border="0" align="left" cellpadding="0"
cellspacing="0">
<tr>
<td align="left" valign="top">
<div id="app" skin='<%nvram_get("sc_skin");%>'></div>
</td>
</tr>
</table>
</td>
<td width="10" align="center" valign="top"></td>
</tr>
</table>
<div id="footer"></div>
</body>

</html>
Loading

0 comments on commit 4d731da

Please sign in to comment.