xm/ShellCrash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #46 from A7T/patch-1

Browse Source 
因未使用root而终止安装时，安装脚本须返回非0值
This commit is contained in:
juewuy
2021-06-26 16:16:14 +08:00
committed by GitHub
parent 1b83ca2a39 b6068a50e4
commit e9b7a1b595
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
install.sh
View File

@@ -18,7 +18,7 @@ if [ "$USER" != "root" -a -z "$systype" ];then
$echo "\033[31m请尽量使用root用户（不要直接使用sudo命令！）执行安装!\033[0m" $echo "\033[31m请尽量使用root用户（不要直接使用sudo命令！）执行安装!\033[0m"
echo ----------------------------------------------- echo -----------------------------------------------
read -p "仍要安装？可能会产生未知错误！(1/0) > " res read -p "仍要安装？可能会产生未知错误！(1/0) > " res
[ "$res" != "1" ] && exit [ "$res" != "1" ] && exit 1
fi fi
webget(){ webget(){
#参数【$1】代表下载目录，【$2】代表在线地址 #参数【$1】代表下载目录，【$2】代表在线地址
@@ -51,7 +51,7 @@ echo -----------------------------------------------
read -p "请输入相应数字 > " num read -p "请输入相应数字 > " num
if [ -z $num ];then if [ -z $num ];then
echo 安装已取消 echo 安装已取消
exit; exit 1;
elif [ "$num" = "1" ];then elif [ "$num" = "1" ];then
webget /tmp/clashrelease $url/bin/release_version echoon rediroff 2>/tmp/clashrelease webget /tmp/clashrelease $url/bin/release_version echoon rediroff 2>/tmp/clashrelease
if [ "$result" = "200" ];then if [ "$result" = "200" ];then
@@ -159,7 +159,7 @@ else
#设置目录 #设置目录
if [ -z $num ];then if [ -z $num ];then
echo 安装已取消 echo 安装已取消
exit; exit 1;
elif [ "$num" = "1" ];then elif [ "$num" = "1" ];then
dir=/etc dir=/etc
elif [ "$num" = "2" ];then elif [ "$num" = "2" ];then
@@ -179,7 +179,7 @@ else
fi fi
else else
echo 安装已取消！！！ echo 安装已取消！！！
exit; exit 1;
fi fi
fi fi
if [ ! -w $dir ];then if [ ! -w $dir ];then
@@ -217,7 +217,7 @@ if [ -n "$clashdir" ];then
install install
else else
$echo "\033[31m输入错误！已取消安装！\033[0m" $echo "\033[31m输入错误！已取消安装！\033[0m"
exit; exit 1;
fi fi
else else
setdir setdir

10
install_n.sh
View File

@@ -18,7 +18,7 @@ if [ "$USER" != "root" -a -z "$systype" ];then
$echo "\033[31m请尽量使用root用户（不要直接使用sudo命令！）执行安装!\033[0m" $echo "\033[31m请尽量使用root用户（不要直接使用sudo命令！）执行安装!\033[0m"
echo ----------------------------------------------- echo -----------------------------------------------
read -p "仍要安装？可能会产生未知错误！(1/0) > " res read -p "仍要安装？可能会产生未知错误！(1/0) > " res
[ "$res" != "1" ] && exit [ "$res" != "1" ] && exit 1
fi fi
webget(){ webget(){
#参数【$1】代表下载目录，【$2】代表在线地址 #参数【$1】代表下载目录，【$2】代表在线地址
@@ -51,7 +51,7 @@ echo -----------------------------------------------
read -p "请输入相应数字 > " num read -p "请输入相应数字 > " num
if [ -z $num ];then if [ -z $num ];then
echo 安装已取消 echo 安装已取消
exit; exit 1;
elif [ "$num" = "1" ];then elif [ "$num" = "1" ];then
webget /tmp/clashrelease $url/bin/release_version echoon rediroff 2>/tmp/clashrelease webget /tmp/clashrelease $url/bin/release_version echoon rediroff 2>/tmp/clashrelease
if [ "$result" = "200" ];then if [ "$result" = "200" ];then
@@ -159,7 +159,7 @@ else
#设置目录 #设置目录
if [ -z $num ];then if [ -z $num ];then
echo 安装已取消 echo 安装已取消
exit; exit 1;
elif [ "$num" = "1" ];then elif [ "$num" = "1" ];then
dir=/etc dir=/etc
elif [ "$num" = "2" ];then elif [ "$num" = "2" ];then
@@ -179,7 +179,7 @@ else
fi fi
else else
echo 安装已取消！！！ echo 安装已取消！！！
exit; exit 1;
fi fi
fi fi
if [ ! -w $dir ];then if [ ! -w $dir ];then
@@ -217,7 +217,7 @@ if [ -n "$clashdir" ];then
install install
else else
$echo "\033[31m输入错误！已取消安装！\033[0m" $echo "\033[31m输入错误！已取消安装！\033[0m"
exit; exit 1;
fi fi
else else
setdir setdir