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

v0.8.7

Browse Source 
~修复了脚本更新路径不正确的bug
~调整了geoip数据库下载源地址
~增加了自定义源输入检测
This commit is contained in:
juewuy
2020-08-11 10:17:00 +08:00
parent 99f2644392
commit ebd1e10c03
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/clashfm.tar.gz
View File

Binary file not shown.

2
bin/version
View File

@@ -1 +1 @@
versionsh=0.8.6 versionsh=0.8.7

4
scripts/clash.sh
View File

@@ -3,9 +3,9 @@
getconfig(){ getconfig(){
#版本号 #版本号
versionsh_l=0.8.6 versionsh_l=0.8.7
#服务器地址 #服务器地址
if [ ! -n "$update_url" ]; then if [ ! -n "$update_url" ] && [ ! -z "$update_url" ]; then
update_url=https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi/ update_url=https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi/
fi fi
#文件路径 #文件路径

13
scripts/getdate.sh
View File

@@ -241,7 +241,7 @@ if [ "$res" = '1' ]; then
echo ----------------------------------------------- echo -----------------------------------------------
echo 开始解压文件！ echo 开始解压文件！
mkdir -p $clashdir > /dev/null mkdir -p $clashdir > /dev/null
tar -zxvf '/tmp/clashfm.tar.gz' -C $clashdir > /dev/null tar -zxvf '/tmp/clashfm.tar.gz' -C $clashdir/ > /dev/null
[ $? -ne 0 ] && echo "文件解压失败！" && exit 1 [ $? -ne 0 ] && echo "文件解压失败！" && exit 1
#初始化文件目录 #初始化文件目录
mv $clashdir/clashservice /etc/init.d/clash #将clash服务文件移动到系统目录 mv $clashdir/clashservice /etc/init.d/clash #将clash服务文件移动到系统目录
@@ -356,7 +356,7 @@ echo -e "\033[30;46m感谢Alecthw大神提供的优质GeoIP数据库！！！\03
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "\033[33m请选择下载源：\033[0m" echo -e "\033[33m请选择下载源：\033[0m"
echo -e " 1 默认源：$update_url" echo -e " 1 默认源：$update_url"
echo -e " 2 Alecthw大神提供的服务器" echo -e " 2 Alecthw大神的Github(需开启clash服务)"
echo -e " 0 返回上级菜单" echo -e " 0 返回上级菜单"
read -p "请输入对应数字 > " num read -p "请输入对应数字 > " num
if [ -z $num ]; then if [ -z $num ]; then
@@ -369,7 +369,7 @@ read -p "请输入对应数字 > " num
geolink="$update_url/bin/Country.mmdb" geolink="$update_url/bin/Country.mmdb"
#echo $geolink #echo $geolink
elif [[ $num == 2 ]]; then elif [[ $num == 2 ]]; then
geolink="http://www.ideame.top/mmdb/Country.mmdb" geolink="-x 127.0.0.1:7890 https://raw.githubusercontent.com/alecthw/mmdb_china_ip_list/release/Country.mmdb"
else else
echo -e "\033[31m请输入正确的数字！\033[0m" echo -e "\033[31m请输入正确的数字！\033[0m"
update update
@@ -446,7 +446,7 @@ echo -----------------------------------------------
echo -e " 1 CDN源(感谢\033[4;32mwww.jsdelivr.com\033[0m，推荐)" echo -e " 1 CDN源(感谢\033[4;32mwww.jsdelivr.com\033[0m，推荐)"
echo -e " 2 Github源(不稳定，不推荐)" echo -e " 2 Github源(不稳定，不推荐)"
echo -e " 3 Github源+clash代理(需开启clash服务，推荐)" echo -e " 3 Github源+clash代理(需开启clash服务，推荐)"
echo -e " 4 自定义输入" echo -e " 4 自定义输入(请务必确保路径正确)"
echo -e " 0 返回上级菜单" echo -e " 0 返回上级菜单"
read -p "请输入对应数字 > " num read -p "请输入对应数字 > " num
if [ -z $num ]; then if [ -z $num ]; then
@@ -464,6 +464,11 @@ elif [[ $num == 3 ]]; then
elif [[ $num == 4 ]]; then elif [[ $num == 4 ]]; then
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
read -p "请输入个人源路径 > " update_url read -p "请输入个人源路径 > " update_url
if [ -n $update_url ];then
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo -e "\033[31m取消输入，返回上级菜单！\033[0m"
update
fi
else else
echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
echo -e "\033[31m请输入正确的数字！\033[0m" echo -e "\033[31m请输入正确的数字！\033[0m"