From 46fd3ffb859d603d7707cf9f7c3e3fbb74dcf290 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Fri, 14 Apr 2023 16:45:31 +0800
Subject: [PATCH] =?UTF-8?q?~=E4=BF=AE=E5=A4=8D=E7=9B=AE=E5=BD=95=E7=A9=BA?=
 =?UTF-8?q?=E9=97=B4=E5=A4=A7=E5=B0=8F=E6=A3=80=E6=B5=8B=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh      | 4 ++--
 scripts/init.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index 3eef448..65151cb 100644
--- a/install.sh
+++ b/install.sh
@@ -11,7 +11,7 @@ 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}'
+	df $2 $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}'
 }
 setconfig(){
 	configpath=$clashdir/mark
@@ -168,7 +168,7 @@ fi
 if [ ! -w $dir ];then
 	$echo "\033[31m没有$dir目录写入权限！请重新设置！\033[0m" && sleep 1 && setdir
 else
-	$echo "目标目录\033[32m$dir\033[0m空间剩余：$(dir_avail $dir)"
+	$echo "目标目录\033[32m$dir\033[0m空间剩余：$(dir_avail $dir -h)"
 	read -p "确认安装？(1/0) > " res
 	[ "$res" = "1" ] && clashdir=$dir/clash || setdir
 fi
diff --git a/scripts/init.sh b/scripts/init.sh
index 7776279..c8cf2a7 100644
--- a/scripts/init.sh
+++ b/scripts/init.sh
@@ -5,7 +5,7 @@ version=1.7.4f
 
 setdir(){
 	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}'
+		df $2 $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}'
 	}
 	set_usb_dir(){
 		echo -e "请选择安装目录"
@@ -116,7 +116,7 @@ fi
 if [ ! -w $dir ];then
 	echo -e "\033[31m没有$dir目录写入权限！请重新设置！\033[0m" && sleep 1 && setdir
 else
-	echo -e "目标目录\033[32m$dir\033[0m空间剩余：$(dir_avail $dir)"
+	echo -e "目标目录\033[32m$dir\033[0m空间剩余：$(dir_avail $dir -h)"
 	read -p "确认安装？(1/0) > " res
 	[ "$res" = "1" ] && clashdir=$dir/clash || setdir
 fi
@@ -151,7 +151,7 @@ mv -f /tmp/SC_tmp/* $clashdir 2>/dev/null
 #初始化
 [ -f "$clashdir/mark" ] || echo '#ShellClash配置文件，不明勿动！' > $clashdir/mark
 #本地安装跳过新手引导
-[ -z "$url" ] && setconfig userguide 1
+#[ -z "$url" ] && setconfig userguide 1
 #判断系统类型写入不同的启动文件
 if [ -f /etc/rc.common ];then
 		#设为init.d方式启动