Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitf2f2936

Browse files
committed
do the right thing#2
1 parent87ac0b4 commitf2f2936

File tree

2 files changed

+32
-29
lines changed

2 files changed

+32
-29
lines changed

‎softcenter/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#! /bin/sh
2-
VERSION=1.4.5
2+
VERSION=1.4.6
33

44
cat version
55
rm -f softcenter.tar.gz

‎softcenter/softcenter/scripts/ks_tar_intall.sh‎

Lines changed: 31 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
export KSROOT=/koolshare
66
source$KSROOT/scripts/base.sh
77
alias echo_date='echo 【$(date +%Y年%m月%d日\ %X)】:'
8-
eval`dbusexport soft`
8+
eval$(dbusexport soft)
99
TARGET_DIR=/tmp
1010

1111
clean(){
@@ -18,12 +18,13 @@ clean(){
1818
}
1919

2020
detect_package(){
21+
local TEST_WORD="$1"
2122
local ILLEGAL_KEYWORDS="ss|ssr|shadowsocks|shadowsocksr|v2ray|trojan|clash|wireguard|koolss|brook"
22-
local KEY_MATCH=$(echo$soft_name| grep -Eo"$ILLEGAL_KEYWORDS")
23+
local KEY_MATCH=$(echo"${TEST_WORD}"| grep -Eo"$ILLEGAL_KEYWORDS")
2324

2425
if [-n"$KEY_MATCH" ];then
2526
echo_date =======================================================
26-
echo_date"检测到离线安装包名：${soft_name}含有非法关键词！！！"
27+
echo_date"检测到离线安装包：${soft_name}含非法关键词！！！"
2728
echo_date"根据法律规定，koolshare软件中心将不会安装此插件！！！"
2829
echo_date"删除相关文件并退出..."
2930
echo_date =======================================================
@@ -35,25 +36,22 @@ detect_package(){
3536
install_tar(){
3637

3738
# do the right thing
38-
detect_package
39+
detect_package"$soft_name"
3940

40-
name=`echo"$soft_name"|sed's/.tar.gz//g'|awk -F"_"'{print $1}'|awk -F"-"'{print $1}'`
41+
name=$(echo"$soft_name"|sed's/.tar.gz//g'|awk -F"_"'{print $1}'|awk -F"-"'{print $1}')
4142
INSTALL_SUFFIX=_install
4243
VER_SUFFIX=_version
4344
NAME_SUFFIX=_name
4445
cd /tmp
4546
echo_date ====================== step 1 ===========================
4647
echo_date 开启软件离线安装！
47-
sleep 1
4848
if [-f$TARGET_DIR/$soft_name ];then
49-
echo_date$TARGET_DIR目录下检测到上传的离线安装包$soft_name
50-
sleep 1
49+
local _SIZE=$(ls -lh$TARGET_DIR/$soft_name|awk'{print $5}')
50+
echo_date$TARGET_DIR目录下检测到上传的离线安装包$soft_name，大小：$_SIZE
5151
echo_date 尝试解压离线安装包离线安装包
52-
sleep 1
5352
tar -zxvf$soft_name>/dev/null2>&1
5453
if ["$?"=="0" ];then
5554
echo_date 解压完成！
56-
sleep 1
5755
cd /tmp
5856
else
5957
echo_date 解压错误，错误代码："$?"！
@@ -62,19 +60,24 @@ install_tar(){
6260
clean
6361
dbus remove"softcenter_module_$MODULE_NAME$INSTALL_SUFFIX"
6462
echo_date ======================== end ============================
63+
echo XU6J03M6
6564
exit
6665
fi
6766

6867
if [-f /tmp/$name/install.sh ];then
6968
INSTALL_SCRIPT=/tmp/$name/install.sh
7069
else
71-
INSTALL_SCRIPT_NU=`find /tmp -name"install.sh"|wc -l`2>/dev/null
72-
["$INSTALL_SCRIPT_NU"=="1" ]&& INSTALL_SCRIPT=`find /tmp -name"install.sh"`|| INSTALL_SCRIPT=""
70+
INSTALL_SCRIPT_NU=$(find /tmp -name"install.sh"|wc -l)2>/dev/null
71+
["$INSTALL_SCRIPT_NU"=="1" ]&& INSTALL_SCRIPT=$(find /tmp -name"install.sh")|| INSTALL_SCRIPT=""
7372
fi
7473

7574
if [-n"$INSTALL_SCRIPT"-a-f"$INSTALL_SCRIPT" ];then
76-
SCRIPT_AB_DIR=`dirname$INSTALL_SCRIPT`
75+
SCRIPT_AB_DIR=$(dirname$INSTALL_SCRIPT)
7776
MODULE_NAME=${SCRIPT_AB_DIR##*/}
77+
78+
# do the right thing
79+
detect_package"$MODULE_NAME"
80+
7881
echo_date 准备安装$MODULE_NAME插件！
7982
echo_date 找到安装脚本！
8083
chmod +x$INSTALL_SCRIPT>/dev/null2>&1
@@ -83,51 +86,50 @@ install_tar(){
8386
sleep 1
8487
start-stop-daemon -S -q -x$INSTALL_SCRIPT2>&1
8588
if ["$?"!="0" ];then
86-
echo_date 因为$MODULE_NAME插件安装失败！退出离线安装！
89+
echo_date 因为${MODULE_NAME}插件安装失败！退出离线安装！
8790
clean
88-
dbus remove"softcenter_module_$MODULE_NAME$INSTALL_SUFFIX"
91+
dbus remove"softcenter_module_${MODULE_NAME}${INSTALL_SUFFIX}"
8992
echo_date ======================== end ============================
93+
echo XU6J03M6
9094
exit
9195
fi
9296
echo_date ====================== step 3 ===========================
93-
dbusset"softcenter_module_$MODULE_NAME$NAME_SUFFIX=$MODULE_NAME"
94-
dbusset"softcenter_module_$MODULE_NAME$INSTALL_SUFFIX=1"
97+
dbusset"softcenter_module_${MODULE_NAME}${NAME_SUFFIX}=${MODULE_NAME}"
98+
dbusset"softcenter_module_${MODULE_NAME}${INSTALL_SUFFIX}=1"
9599
if [-n"$soft_install_version" ];then
96-
dbusset"softcenter_module_$MODULE_NAME$VER_SUFFIX=$soft_install_version"
100+
dbusset"softcenter_module_${MODULE_NAME}${VER_SUFFIX}=$soft_install_version"
97101
echo_date"从插件文件名中获取到了版本号：$soft_install_version"
98102
else
99-
if [-z"`dbus get softcenter_module_$MODULE_NAME$VER_SUFFIX`" ];then
100-
dbusset"softcenter_module_$MODULE_NAME$VER_SUFFIX=0.1"
103+
if [-z"$(dbus get softcenter_module_${MODULE_NAME}${VER_SUFFIX})" ];then
104+
dbusset"softcenter_module_${MODULE_NAME}${VER_SUFFIX}=0.1"
101105
echo_date"插件安装脚本里没有找到版本号，设置默认版本号为0.1"
102106
else
103-
echo_date"插件安装脚本已经设置了插件版本号为：`dbus get softcenter_module_$MODULE_NAME$VER_SUFFIX`"
107+
echo_date"插件安装脚本已经设置了插件版本号为：$(dbus get softcenter_module_${MODULE_NAME}${VER_SUFFIX})"
104108
fi
105109
fi
106-
install_pid=`ps| grep -w install.sh| grep -v grep| awk'{print $1}'`
110+
install_pid=$(ps| grep -w install.sh| grep -v grep| awk'{print $1}')
107111
i=120
108112
until [-z"$install_pid" ]
109113
do
110-
install_pid=`ps| grep -w install.sh| grep -v grep| awk'{print $1}'`
114+
install_pid=$(ps| grep -w install.sh| grep -v grep| awk'{print $1}')
111115
i=$(($i-1))
112116
if ["$i"-lt 1 ];then
113117
echo_date"Could not load nat rules!"
114118
echo_date 安装似乎出了点问题，请手动重启路由器后重新尝试...
115119
echo_date 删除相关文件并退出...
116120
sleep 1
117121
clean
118-
dbus remove"softcenter_module_$MODULE_NAME$INSTALL_SUFFIX"
122+
dbus remove"softcenter_module_${MODULE_NAME}${INSTALL_SUFFIX}"
119123
echo_date ======================== end ============================
124+
echo XU6J03M6
120125
exit
121126
fi
122127
sleep 1
123128
done
124129
echo_date 离线包安装完成！
125-
sleep 1
126130
echo_date 一点点清理工作...
127-
sleep 1
128131
clean
129132
echo_date 完成！离线安装插件成功，现在你可以退出本页面~
130-
sleep 1
131133
else
132134
echo_date 没有找到安装脚本！
133135
echo_date 删除相关文件并退出...
@@ -140,9 +142,10 @@ install_tar(){
140142
fi
141143
clean
142144
echo_date ======================== end ============================
145+
echo XU6J03M6
143146
}
144147

145-
cat /dev/null> /tmp/syscmd.log
148+
true> /tmp/syscmd.log
146149
install_tar>> /tmp/syscmd.log
147150

148151

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp