1.6.1f

Author: frainzy1477

root/usr/share/clash/yum_change.sh

@@ -28,23 +28,18 @@ if [ -z "$(grep "^ \{0,\}tun:" $CONFIG_YAML)" ] || [ -z "$(grep "^ \{0,\}listen:
 fi
 elif [ "${tun_mode}" -eq 1 ] && [ "${core}" -eq 3 ] || [ "${tun_mode}" -eq 1 ] && [ "${core}" -eq 4 ];then
 	uci set clash.config.mode="0" && uci set clash.config.tun_mode="1" && uci commit clash	
-
-else
-	uci set clash.config.mode="0" && uci set clash.config.tun_mode="0" && uci commit clash	
 fi	
 fi
 
 
-if [ "${core}" -eq 1 ] || [ "${core}" -eq 2 ];then
+if [ "$core" -eq 1 ] || [ "$core" -eq 2 ];then
 if [ "${mode}" -eq 0 ] && [ "${core}" -eq 1 ] || [ "${mode}" -eq 0 ] && [ "${core}" -eq 2 ];then
 if [ -z "$(grep "^ \{0,\}listen:" $CONFIG_YAML)" ] || [ -z "$(grep "^ \{0,\}enhanced-mode:" $CONFIG_YAML)" ] || [ -z "$(grep "^ \{0,\}enable:" $CONFIG_YAML)" ] || [ -z "$(grep "^ \{0,\}dns:" $CONFIG_YAML)" ] ;then
 	uci set clash.config.mode="1" && uci set clash.config.tun_mode="0" && uci commit clash
 fi
-elif [ "${mode}" -eq 1 ] && [ "${core}" -eq 1 ] || [ "${mode}" -eq 1 ] && [ "${core}" -eq 2 ];then
+elif [ "$mode" -eq 1 ] && [ "$core" -eq 1 ] || [ "$mode" -eq 1 ] && [ "$core" -eq 2 ];then
 	uci set clash.config.mode="1" && uci set clash.config.tun_mode="0" && uci commit clash
 
-else
-	uci set clash.config.mode="0" && uci set clash.config.tun_mode="0" && uci commit clash
 fi
 fi
 
@@ -68,9 +63,9 @@ sleep 3
 		p_mode=$(uci get clash.config.p_mode 2>/dev/null)
 
 if [ "${mode}" -eq 1 ];  then
-	
+if [ "$core" -eq 1 ] || [ "$core" -eq 2 ];then	
  	if [ $lang == "en" ] || [ $lang == "auto" ];then
-		echo "Setting Up Ports and Password.. " >$REAL_LOG 
+		echo "Setting Up Ports and Password.. " >$REAL_LOG  
 	elif [ $lang == "zh_cn" ];then
     	 echo "设置端口,DNS和密码..." >$REAL_LOG
 	fi
@@ -123,9 +118,9 @@ if [ "${mode}" -eq 1 ];  then
 		sed -i "/dns:/i\     " $CONFIG_YAML 2>/dev/null
 		fi
 		sed -i '/#clash-openwrt/ d' $CONFIG_YAML 2>/dev/null	
-		
+fi		
 elif [ "${tun_mode}" -eq 1 ];  then
-	
+if [ "${core}" -eq 3 ] || [ "${core}" -eq 4 ];then	
  	if [ $lang == "en" ] || [ $lang == "auto" ];then
 		echo "Setting Up Ports and Password.. " >$REAL_LOG 
 	elif [ $lang == "zh_cn" ];then
@@ -178,6 +173,7 @@ elif [ "${tun_mode}" -eq 1 ];  then
 		sed -i "/dns:/i\     " $CONFIG_YAML 2>/dev/null
 		fi		
 		sed -i '/#clash-openwrt/ d' $CONFIG_YAML 2>/dev/null
+fi
 else
  	if [ $lang == "en" ] || [ $lang == "auto" ];then
 		echo "Setting Up Ports and Password.. " >$REAL_LOG