diff --git a/install.sh b/install.sh index d0704e7..a0181d6 100644 --- a/install.sh +++ b/install.sh @@ -10,6 +10,7 @@ url="https://cdn.jsdelivr.net/gh/juewuy/ShellClash" release_new=$(curl -kfsSL --resolve api.github.com:443:140.82.113.5 "https://api.github.com/repos/juewuy/ShellClash/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') [ -z "$release_new" ] && release_new=$(curl -kfsSL $url/bin/version | grep "versionsh" | awk -F "=" '{print $2}') [ -z "$release_new" ] && echo "无法连接服务器!" && exit + echo -e "最新版本:\033[32m$release_new\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[44m如遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" @@ -59,25 +60,28 @@ echo 开始解压文件! mkdir -p $dir/clash > /dev/null tar -zxvf '/tmp/clashfm.tar.gz' -C $dir/clash/ [ $? -ne 0 ] && echo "文件解压失败!" && exit 1 -#判断系统类型写入不同的启动文件 -if [ -n "$(cat /proc/version | grep -i openwrt)" ];then - mv $dir/clash/clashservice /etc/init.d/clash #将rc服务文件移动到系统目录 - chmod 777 /etc/init.d/clash #授予权限 - rm -rf $dir/clash/clash.service -else - [ -d /etc/systemd/system ] && sysdir=/etc/systemd/system - [ -d /usr/lib/systemd/system/ ] && sysdir=/usr/lib/systemd/system/ - mv $dir/clash/clash.service $sysdir/clash.service #将service服务文件移动到系统目录 - sed -i "s%/etc/clash%${dir}/clash%g" $sysdir/clash.service - rm -rf $dir/clash/clashservice - rm -rf /etc/init.d/clash -fi #初始化文件目录 if [ ! -f "$dir/clash/mark" ]; then cat >$dir/clash/mark<> /etc/profile #设置快捷命令环境变量 sed -i '/export clashdir=*/'d /etc/profile echo "export clashdir=\"$dir/clash\"" >> /etc/profile #设置clash路径环境变量 #删除临时文件 rm -rf /tmp/clashfm.tar.gz +rm -rf $dir/clash/clashservice +rm -rf $dir/clash/clash.service +rm -rf /etc/init.d/clash #提示 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo ShellClash 已经安装成功! diff --git a/install_cdn.sh b/install_cdn.sh index d0704e7..a0181d6 100644 --- a/install_cdn.sh +++ b/install_cdn.sh @@ -10,6 +10,7 @@ url="https://cdn.jsdelivr.net/gh/juewuy/ShellClash" release_new=$(curl -kfsSL --resolve api.github.com:443:140.82.113.5 "https://api.github.com/repos/juewuy/ShellClash/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') [ -z "$release_new" ] && release_new=$(curl -kfsSL $url/bin/version | grep "versionsh" | awk -F "=" '{print $2}') [ -z "$release_new" ] && echo "无法连接服务器!" && exit + echo -e "最新版本:\033[32m$release_new\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[44m如遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" @@ -59,25 +60,28 @@ echo 开始解压文件! mkdir -p $dir/clash > /dev/null tar -zxvf '/tmp/clashfm.tar.gz' -C $dir/clash/ [ $? -ne 0 ] && echo "文件解压失败!" && exit 1 -#判断系统类型写入不同的启动文件 -if [ -n "$(cat /proc/version | grep -i openwrt)" ];then - mv $dir/clash/clashservice /etc/init.d/clash #将rc服务文件移动到系统目录 - chmod 777 /etc/init.d/clash #授予权限 - rm -rf $dir/clash/clash.service -else - [ -d /etc/systemd/system ] && sysdir=/etc/systemd/system - [ -d /usr/lib/systemd/system/ ] && sysdir=/usr/lib/systemd/system/ - mv $dir/clash/clash.service $sysdir/clash.service #将service服务文件移动到系统目录 - sed -i "s%/etc/clash%${dir}/clash%g" $sysdir/clash.service - rm -rf $dir/clash/clashservice - rm -rf /etc/init.d/clash -fi #初始化文件目录 if [ ! -f "$dir/clash/mark" ]; then cat >$dir/clash/mark<> /etc/profile #设置快捷命令环境变量 sed -i '/export clashdir=*/'d /etc/profile echo "export clashdir=\"$dir/clash\"" >> /etc/profile #设置clash路径环境变量 #删除临时文件 rm -rf /tmp/clashfm.tar.gz +rm -rf $dir/clash/clashservice +rm -rf $dir/clash/clash.service +rm -rf /etc/init.d/clash #提示 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo ShellClash 已经安装成功! diff --git a/install_test.sh b/install_test.sh index b8d5019..aac8a91 100644 --- a/install_test.sh +++ b/install_test.sh @@ -13,6 +13,7 @@ url="--resolve raw.githubusercontent.com:443:199.232.68.133 https://raw.githubus #release_new=$(curl -kfsSL --resolve api.github.com:443:140.82.113.5 "https://api.github.com/repos/juewuy/ShellClash/releases/latest" | grep "tag_name" | head -n 1 | awk -F ":" '{print $2}' | sed 's/\"//g;s/,//g;s/ //g') [ -z "$release_new" ] && release_new=$(curl -kfsSL $url/bin/version | grep "versionsh" | awk -F "=" '{print $2}') [ -z "$release_new" ] && echo "无法连接服务器!" && exit + echo -e "最新版本:\033[32m$release_new\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[44m如遇问题请加TG群反馈:\033[42;30m t.me/clashfm \033[0m" @@ -48,7 +49,6 @@ fi echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo 开始从服务器获取安装文件! echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -#tarurl=$url@$release_new/bin/clashfm.tar.gz tarurl=$url/bin/clashfm.tar.gz if command -v curl &> /dev/null; then result=$(curl -w %{http_code} -kLo /tmp/clashfm.tar.gz $tarurl) @@ -63,39 +63,44 @@ echo 开始解压文件! mkdir -p $dir/clash > /dev/null tar -zxvf '/tmp/clashfm.tar.gz' -C $dir/clash/ [ $? -ne 0 ] && echo "文件解压失败!" && exit 1 -#判断系统类型写入不同的启动文件 -if [ -n "$(cat /proc/version | grep -i openwrt)" ];then - mv $dir/clash/clashservice /etc/init.d/clash #将rc服务文件移动到系统目录 - chmod 777 /etc/init.d/clash #授予权限 - rm -rf $dir/clash/clash.service -else - [ -d /etc/systemd/system ] && sysdir=/etc/systemd/system - [ -d /usr/lib/systemd/system/ ] && sysdir=/usr/lib/systemd/system/ - mv $dir/clash/clash.service $sysdir/clash.service #将service服务文件移动到系统目录 - sed -i "s%/etc/clash%${dir}/clash%g" $sysdir/clash.service - rm -rf $dir/clash/clashservice - rm -rf /etc/init.d/clash -fi #初始化文件目录 if [ ! -f "$dir/clash/mark" ]; then cat >$dir/clash/mark<> /etc/profile #设置快捷命令环境变量 sed -i '/export clashdir=*/'d /etc/profile echo "export clashdir=\"$dir/clash\"" >> /etc/profile #设置clash路径环境变量 #删除临时文件 rm -rf /tmp/clashfm.tar.gz +rm -rf $dir/clash/clashservice +rm -rf $dir/clash/clash.service +rm -rf /etc/init.d/clash #提示 echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo ShellClash 已经安装成功! @@ -103,3 +108,4 @@ echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ echo -e "\033[33m输入\033[30;47m clash \033[0;33m命令即可管理!!!\033[0m" echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + diff --git a/scripts/clashservice b/scripts/clashservice index 4086b23..6a6d364 100644 --- a/scripts/clashservice +++ b/scripts/clashservice @@ -1,14 +1,15 @@ #!/bin/sh /etc/rc.common -# Example script -# Copyright (C) 2007 OpenWrt.org -USE_PROCD=1 START=92 +SERVICE_DAEMONIZE=1 +SERVICE_WRITE_PID=1 +USE_PROCD=1 + + start_service() { - #开机加载环境变量保证找到文件路径 - source /etc/profile > /dev/null 2>&1 - #创建clash后台进程 + clashdir=$(cat /etc/profile|grep clashdir|awk -F "\"" '{print $2}') + #使用procd创建clash后台进程 procd_open_instance procd_set_param respawn procd_set_param stderr 1 @@ -16,5 +17,18 @@ start_service() { procd_set_param command $clashdir/clash -d $clashdir procd_close_instance #其他设置 - sh $clashdir/start.sh afstart + $clashdir/start.sh afstart } + +start() { + if [ -z "$(pidof procd)" ];then + clashdir=$(cat /etc/profile|grep clashdir|awk -F "\"" '{print $2}') + #创建后台进程 + service_start $clashdir/clash -d $clashdir + #$clashdir/start.sh deamon + #其他设置 + $clashdir/start.sh afstart + else + start_service + fi +} \ No newline at end of file diff --git a/scripts/getdate.sh b/scripts/getdate.sh index a1cf188..fb599f1 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -245,17 +245,20 @@ if [ "$res" = '1' ]; then tar -zxvf '/tmp/clashfm.tar.gz' -C $clashdir/ > /dev/null [ $? -ne 0 ] && echo "文件解压失败!" && exit 1 #判断系统类型写入不同的启动文件 - if [ -n "$(cat /proc/version | grep -i openwrt)" ];then + if [ -f /etc/rc.common ];then mv $clashdir/clashservice /etc/init.d/clash #将rc服务文件移动到系统目录 chmod 777 /etc/init.d/clash #授予权限 - rm -rf $clashdir/clash.service else [ -d /etc/systemd/system ] && sysdir=/etc/systemd/system [ -d /usr/lib/systemd/system/ ] && sysdir=/usr/lib/systemd/system/ - mv $clashdir/clash.service $sysdir/clash.service #将service服务文件移动到系统目录 - sed -i "s%/etc/clash%${clashdir}%g" $sysdir/clash.service - rm -rf $clashdir/clashservice - rm -rf /etc/init.d/clash + if [ -n "$sysdir" ];then + mv $clashdir/clash.service $sysdir/clash.service #将service服务文件移动到系统目录 + sed -i "s%/etc/clash%${dir}/clash%g" $sysdir/clash.service + else + #设为保守模式 + sed -i '/start_old=*/'d $clashdir/mark + sed -i "1i\start_old=已开启" $clashdir/mark + fi fi #修饰文件及版本号 shtype=sh && [ -n "$(ls -l /bin/sh|grep -o dash)" ] && shtype=bash