From d27ebdb0a8ec8effb837c11b527077a8732f5418 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Fri, 13 Jan 2023 20:39:59 +0800
Subject: [PATCH] =?UTF-8?q?~=E4=BC=98=E5=8C=96=E5=AE=89=E8=A3=85=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC=EF=BC=8C=E9=80=82=E9=85=8D=E6=9C=AC=E5=9C=B0=E5=AE=89?=
 =?UTF-8?q?=E8=A3=85=20~=E7=A7=BB=E9=99=A4=E6=AD=A3=E5=BC=8F=E7=89=88?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh | 235 +++++++++++++++++++----------------------------------
 1 file changed, 82 insertions(+), 153 deletions(-)

diff --git a/install.sh b/install.sh
index 6e2ce61..4289dab 100644
--- a/install.sh
+++ b/install.sh
@@ -9,6 +9,7 @@ echo "**                 欢迎使用                  **"
 echo "**                ShellClash                 **"
 echo "**                             by  Juewuy    **"
 echo "***********************************************"
+#内置工具
 dir_avail(){
 	df -h $1 |awk '{ for(i=1;i<=NF;i++){ if(NR==1){ arr[i]=$i; }else{ arr[i]=arr[i]" "$i; } } } END{ for(i=1;i<=NF;i++){ print arr[i]; } }' |grep Ava |awk '{print $2}'
 }
@@ -16,26 +17,6 @@ setconfig(){
 	configpath=$clashdir/mark
 	[ -n "$(grep ${1} $configpath)" ] && sed -i "s#${1}=.*#${1}=${2}#g" $configpath || echo "${1}=${2}" >> $configpath
 }
-#特殊固件识别及标记
-[ -f "/etc/storage/started_script.sh" ] && {
-	systype=Padavan #老毛子固件
-	initdir='/etc/storage/started_script.sh'
-	}
-[ -d "/jffs" ] && {
-	systype=asusrouter #华硕固件
-	[ -f "/jffs/.asusrouter" ] && initdir='/jffs/.asusrouter'
-	[ -d "/jffs/scripts" ] && initdir='/jffs/scripts/nat-start' 
-	}
-[ -f "/data/etc/crontabs/root" ] && systype=mi_snapshot #小米设备
-#检查root权限
-if [ "$USER" != "root" -a -z "$systype" ];then
-	echo 当前用户:$USER
-	$echo "\033[31m请尽量使用root用户（不要直接使用sudo命令！）执行安装!\033[0m"
-	echo -----------------------------------------------
-	read -p "仍要安装？可能会产生未知错误！(1/0) > " res
-	[ "$res" != "1" ] && exit 1
-fi
-
 webget(){
 	#参数【$1】代表下载目录，【$2】代表在线地址
 	#参数【$3】代表输出显示，【$4】不启用重定向
@@ -57,147 +38,34 @@ webget(){
 		[ $? -eq 0 ] && result="200"
 	fi
 }
-#检查更新
-url_cdn="https://raw.fastgit.org/juewuy/ShellClash"
-[ -z "$url" ] && url=$url_cdn
-echo -----------------------------------------------
-$echo "\033[33m请选择想要安装的版本：\033[0m"	
-$echo " 1 \033[36mShellclash稳定版\033[0m"
-$echo " 2 \033[32mShellclash公测版\033[0m(推荐)"
-echo -----------------------------------------------
-read -p "请输入相应数字 > " num
-if [ -z $num ];then
-	echo 安装已取消！ && exit 1;
-elif [ "$num" = "1" ];then
-	webget /tmp/clashrelease $url_cdn/master/bin/release_version echoon rediroff 2>/tmp/clashrelease
-	if [ "$result" = "200" ];then
-		release_new=$(cat /tmp/clashrelease | head -1)
-		url_dl="$url_cdn/$release_new"
-	else
-		$echo "\033[33m无法获取稳定版安装地址，将尝试安装公测版！\033[0m"
-	fi
-fi
-[ -z "$url_dl" ] && url_dl=$url
-webget /tmp/clashversion "$url_dl/bin/version" echooff
-[ "$result" = "200" ] && versionsh=$(cat /tmp/clashversion | grep "versionsh" | awk -F "=" '{print $2}')
-[ -z "$release_new" ] && release_new=$versionsh
-rm -rf /tmp/clashversion
-rm -rf /tmp/clashrelease
-tarurl=$url_dl/bin/clashfm.tar.gz
-
-init(){
-	$clashdir/start.sh stop 2>/dev/null
-	#解压
-	echo -----------------------------------------------
-	echo 开始解压文件！
-	mkdir -p $clashdir > /dev/null
-	tar -zxvf '/tmp/clashfm.tar.gz' -C $clashdir/
-	[ $? -ne 0 ] && echo "文件解压失败！" && rm -rf /tmp/clashfm.tar.gz && exit 1 
-	#初始化文件目录
-	[ -f "$clashdir/mark" ] || echo '#标识clash运行状态的文件，不明勿动！' > $clashdir/mark
-	#判断系统类型写入不同的启动文件
-	if [ -f /etc/rc.common ];then
-			#设为init.d方式启动
-			cp -f $clashdir/clashservice /etc/init.d/clash
-			chmod 755 /etc/init.d/clash
-	else
-		[ -w /etc/systemd/system ] && sysdir=/etc/systemd/system
-		[ -w /usr/lib/systemd/system ] && sysdir=/usr/lib/systemd/system
-		if [ -n "$sysdir" ];then
-			#设为systemd方式启动
-			mv $clashdir/clash.service $sysdir/clash.service
-			sed -i "s%/etc/clash%$clashdir%g" $sysdir/clash.service
-			systemctl daemon-reload
-		else
-			#设为保守模式启动
-			setconfig start_old 已开启
-		fi
-	fi
-	#修饰文件及版本号
-	shtype=sh && command -v bash &>/dev/null && shtype=bash 
-	sed -i "s|/bin/sh|/bin/$shtype|" $clashdir/start.sh
-	chmod 755 $clashdir/start.sh
-	setconfig versionsh_l $release_new
-	#设置更新地址
-	[ -n "$url" ] && setconfig update_url $url
-	#设置环境变量	
-	[ -w /opt/etc/profile ] && profile=/opt/etc/profile
-	[ -w /jffs/configs/profile.add ] && profile=/jffs/configs/profile.add
-	[ -w ~/.bashrc ] && profile=~/.bashrc
-	[ -w /etc/profile ] && profile=/etc/profile
-	if [ -n "$profile" ];then
-		sed -i '/alias clash=*/'d $profile
-		echo "alias clash=\"$shtype $clashdir/clash.sh\"" >> $profile #设置快捷命令环境变量
-		sed -i '/export clashdir=*/'d $profile
-		echo "export clashdir=\"$clashdir\"" >> $profile #设置clash路径环境变量
-		#适配zsh环境变量
-		[ -n "$(ls -l /bin/sh|grep -oE 'zsh')" ] && [ -z "$(cat ~/.zshrc 2>/dev/null|grep clashdir)" ] && { 
-			echo "alias clash=\"$shtype $clashdir/clash.sh\"" >> ~/.zshrc
-			echo "export clashdir=\"$clashdir\"" >> ~/.zshrc
-		}
-	else
-		$echo "\033[33m无法写入环境变量！请检查安装权限！\033[0m"
-		exit 1
-	fi
-	#梅林/Padavan额外设置
-	[ -n "$initdir" ] && {
-		sed -i '/ShellClash初始化/'d $initdir
-		touch $initdir
-		echo "$clashdir/start.sh init #ShellClash初始化脚本" >> $initdir
-		setconfig initdir $initdir
-		}
-	#小米镜像化OpenWrt额外设置
-	if [ "$systype" = "mi_snapshot" ];then
-		chmod 755 $clashdir/misnap_init.sh
-		uci set firewall.ShellClash=include
-		uci set firewall.ShellClash.type='script'
-		uci set firewall.ShellClash.path='/data/clash/misnap_init.sh'
-		uci set firewall.ShellClash.enabled='1'
-		uci commit firewall
-		setconfig systype $systype
-	else
-		rm -rf $clashdir/misnap_init.sh
-		rm -rf $clashdir/clashservice
-	fi
-	#华硕USB启动额外设置
-	[ "$usb_status" = "1" ]	&& {
-		echo "$clashdir/start.sh init #ShellClash初始化脚本" > $clashdir/asus_usb_mount.sh
-		nvram set script_usbmount="$clashdir/asus_usb_mount.sh"
-		nvram commit
-	}
-	#删除临时文件
-	rm -rf /tmp/clashfm.tar.gz 
-	rm -rf $clashdir/clash.service
+error_down(){
+	$echo "请参考 \033[32mhttps://github.com/juewuy/ShellClash/blob/master/README_CN.md"
+	$echo  "\033[33m使用其他安装源重新安装！\033[0m" 
 }
+#安装及初始化
 gettar(){
 	webget /tmp/clashfm.tar.gz $tarurl
 	if [ "$result" != "200" ];then
-		$echo "\033[33m文件下载失败,请参考 \033[32mhttps://github.com/juewuy/ShellClash/blob/master/README_CN.md"
-		$echo  "\033[33m使用其他安装源重新安装！\033[0m" 
+		$echo "\033[33m文件下载失败！\033[0m"
+		error_down
 		exit 1
 	else
-		init
+		$clashdir/start.sh stop 2>/dev/null
+		#解压
+		echo -----------------------------------------------
+		echo 开始解压文件！
+		mkdir -p $clashdir > /dev/null
+		tar -zxvf '/tmp/clashfm.tar.gz' -C $clashdir/
+		if [ $? -ne 0 ];then
+			rm -rf /tmp/clashfm.tar.gz
+			$echo "\033[33m文件解压失败！\033[0m"
+			error_down
+			exit 1
+		else
+			source $clashdir/init.sh
+		fi		
 	fi
 }
-
-#下载及安装
-install(){
-echo -----------------------------------------------
-if [ -f /tmp/clashfm.tar.gz ];then
-	init
-else
-	echo 开始从服务器获取安装文件！
-	echo -----------------------------------------------
-	gettar	
-fi
-echo -----------------------------------------------
-echo ShellClash 已经安装成功!
-[ "$profile" = "~/.bashrc" ] && echo "请执行【source ~/.bashrc &> /dev/null】命令以加载环境变量！"
-[ -n "$(ls -l /bin/sh|grep -oE 'zsh')" ] && echo "请执行【source ~/.zshrc &> /dev/null】命令以加载环境变量！"
-echo -----------------------------------------------
-$echo "\033[33m输入\033[30;47m clash \033[0;33m命令即可管理！！！\033[0m"
-echo -----------------------------------------------
-}
 setdir(){
 	set_usb_dir(){
 		$echo "请选择安装目录"
@@ -307,6 +175,67 @@ else
 	[ "$res" = "1" ] && clashdir=$dir/clash || setdir
 fi
 }
+install(){
+echo -----------------------------------------------
+echo 开始从服务器获取安装文件！
+echo -----------------------------------------------
+gettar
+echo -----------------------------------------------
+echo ShellClash 已经安装成功!
+[ "$profile" = "~/.bashrc" ] && echo "请执行【source ~/.bashrc &> /dev/null】命令以加载环境变量！"
+[ -n "$(ls -l /bin/sh|grep -oE 'zsh')" ] && echo "请执行【source ~/.zshrc &> /dev/null】命令以加载环境变量！"
+echo -----------------------------------------------
+$echo "\033[33m输入\033[30;47m clash \033[0;33m命令即可管理！！！\033[0m"
+echo -----------------------------------------------
+}
+
+#特殊固件识别及标记
+[ -f "/etc/storage/started_script.sh" ] && {
+	systype=Padavan #老毛子固件
+	initdir='/etc/storage/started_script.sh'
+	}
+[ -d "/jffs" ] && {
+	systype=asusrouter #华硕固件
+	[ -f "/jffs/.asusrouter" ] && initdir='/jffs/.asusrouter'
+	[ -d "/jffs/scripts" ] && initdir='/jffs/scripts/nat-start' 
+	}
+[ -f "/data/etc/crontabs/root" ] && systype=mi_snapshot #小米设备
+#检查root权限
+if [ "$USER" != "root" -a -z "$systype" ];then
+	echo 当前用户:$USER
+	$echo "\033[31m请尽量使用root用户（不要直接使用sudo命令！）执行安装!\033[0m"
+	echo -----------------------------------------------
+	read -p "仍要安装？可能会产生未知错误！(1/0) > " res
+	[ "$res" != "1" ] && exit 1
+fi
+
+#检查更新
+url_cdn="https://raw.fastgit.org/juewuy/ShellClash"
+[ -z "$url" ] && url=$url_cdn
+# echo -----------------------------------------------
+# $echo "\033[33m请选择想要安装的版本：\033[0m"	
+# $echo " 1 \033[36mShellclash稳定版\033[0m"
+# $echo " 2 \033[32mShellclash公测版\033[0m(推荐)"
+# echo -----------------------------------------------
+# read -p "请输入相应数字 > " num
+# if [ -z $num ];then
+	# echo 安装已取消！ && exit 1;
+# elif [ "$num" = "1" ];then
+	# webget /tmp/clashrelease $url_cdn/master/bin/release_version echoon rediroff 2>/tmp/clashrelease
+	# if [ "$result" = "200" ];then
+		# release_new=$(cat /tmp/clashrelease | head -1)
+		# url_dl="$url_cdn/$release_new"
+	# else
+		# $echo "\033[33m无法获取稳定版安装地址，将尝试安装公测版！\033[0m"
+	# fi
+# fi
+[ -z "$url_dl" ] && url_dl=$url
+webget /tmp/clashversion "$url_dl/bin/version" echooff
+[ "$result" = "200" ] && versionsh=$(cat /tmp/clashversion | grep "versionsh" | awk -F "=" '{print $2}')
+[ -z "$release_new" ] && release_new=$versionsh
+rm -rf /tmp/clashversion
+rm -rf /tmp/clashrelease
+tarurl=$url_dl/bin/clashfm.tar.gz
 
 #输出
 $echo "最新版本：\033[32m$release_new\033[0m"