diff --git a/sh/auto_install.sh b/bin/auto_install.sh similarity index 76% rename from sh/auto_install.sh rename to bin/auto_install.sh index c4194e2..7bc3b40 100644 --- a/sh/auto_install.sh +++ b/bin/auto_install.sh @@ -1,16 +1,16 @@ #!/bin/bash -#wget -O- https://git.nps.crabapples.cn/crabapples/learn-spider/raw/branch/main/sh/auto_install.sh | bash +#wget -O- https://git.nps.crabapples.cn/crabapples/learn-spider/raw/branch/main/bin/auto_install.sh | bash echo "清理旧脚本..." rm -rf ./install.sh ./start.sh ./update.sh ./uninstall.sh echo "开始下载..." echo "下载安装脚本..." -wget -q --show-progress https://git.nps.crabapples.cn/crabapples/learn-spider/raw/branch/main/sh/install.sh && chmod +x install.sh +wget -q --show-progress https://git.nps.crabapples.cn/crabapples/learn-spider/raw/branch/main/bin/install.sh && chmod +x install.sh echo "下载启动脚本..." -wget -q --show-progress https://git.nps.crabapples.cn/crabapples/learn-spider/raw/branch/main/sh/start.sh && chmod +x start.sh +wget -q --show-progress https://git.nps.crabapples.cn/crabapples/learn-spider/raw/branch/main/bin/start.sh && chmod +x start.sh echo "下载更新脚本..." -wget -q --show-progress https://git.nps.crabapples.cn/crabapples/learn-spider/raw/branch/main/sh/update.sh && chmod +x update.sh +wget -q --show-progress https://git.nps.crabapples.cn/crabapples/learn-spider/raw/branch/main/bin/update.sh && chmod +x update.sh echo "下载卸载脚本..." -wget -q --show-progress https://git.nps.crabapples.cn/crabapples/learn-spider/raw/branch/main/sh/uninstall.sh && chmod +x uninstall.sh +wget -q --show-progress https://git.nps.crabapples.cn/crabapples/learn-spider/raw/branch/main/bin/uninstall.sh && chmod +x uninstall.sh echo "下载完成" echo "开始安装..." diff --git a/sh/install.sh b/bin/install.sh similarity index 100% rename from sh/install.sh rename to bin/install.sh diff --git a/sh/start.sh b/bin/start.sh similarity index 69% rename from sh/start.sh rename to bin/start.sh index c01c29b..bf5ecd2 100644 --- a/sh/start.sh +++ b/bin/start.sh @@ -1,6 +1,6 @@ #!/bin/bash INDEX=$1 -spider=$2 +spider_code=$2 PUBLIC_DIR="${3:-/shared}" username="user$INDEX" export DISPLAY=:$INDEX @@ -15,11 +15,13 @@ sleep 3 start_spider(){ cd $PUBLIC_DIR/learn-spider - sudo -E ./start_spider.sh $spider # -E 保留当前环境变量 + echo "$PUBLIC_DIR/learn-spider" + echo "正在启动爬虫$spider_code" + sudo -E ./start_spider.sh $spider_code # -E 保留当前环境变量 } echo "启动爬虫" -start_spider $INDEX -echo "爬虫执行完毕,60秒后关闭VNC" -sleep 60 +start_spider +echo "爬虫执行完毕,20秒后关闭VNC" +sleep 20 sudo su - "$username" -c "vncserver -kill :$INDEX" 2>/dev/null diff --git a/sh/uninstall.sh b/bin/uninstall.sh similarity index 100% rename from sh/uninstall.sh rename to bin/uninstall.sh diff --git a/sh/update.sh b/bin/update.sh similarity index 100% rename from sh/update.sh rename to bin/update.sh