update

ganggangdouchuan.sh

@@ -1,7 +1,9 @@
 #!/bin/bash
 echo "开始"
 echo "$(date "+%Y-%m-%d %H:%M:%S") 更新环境变量..."
-cd ~ && source .bash_profile
+# Mac Pro
+# cd ~ && source .bash_profile
+cd ~ && source ./base_profile
 echo "$(date "+%Y-%m-%d %H:%M:%S") 更新环境变量完成！"
 
 echo "$(date "+%Y-%m-%d %H:%M:%S") 正在杀爬虫进程..."
@@ -10,11 +12,16 @@ ps aux | grep run_ganggangdouchuan.py | grep -v grep | awk '{print $2}' | xargs
 echo "$(date "+%Y-%m-%d %H:%M:%S") 进程已杀死！"
 
 echo "$(date "+%Y-%m-%d %H:%M:%S") 正在更新代码..."
-cd /Users/lieyunye/Desktop/crawler/crawler_ganggangdouchuan/ && git pull origin master --force && rm -f nohup.log
+# Mac Pro
+# cd /Users/lieyunye/Desktop/crawler/crawler_ganggangdouchuan/ && git pull origin master --force && rm -f nohup.log
+cd /Users/piaoquan/Desktop/crawler/crawler_ganggangdouchuan/ && git pull origin master --force && rm -f nohup.log
 echo "$(date "+%Y-%m-%d %H:%M:%S") 代码更新完成！"
 
 echo "$(date "+%Y-%m-%d %H:%M:%S") 正在重启Appium..."
 # shellcheck disable=SC2009
+# Mac Pro
+# ps aux | grep Appium.app | grep -v grep | awk '{print $2}' | xargs kill -9
+# nohup /usr/local/bin/node /Applications/Appium.app/Contents/Resources/app/node_modules/appium/build/lib/main.js >>./nohup.log 2>&1 &
 ps aux | grep Appium.app | grep -v grep | awk '{print $2}' | xargs kill -9
 nohup /usr/local/bin/node /Applications/Appium.app/Contents/Resources/app/node_modules/appium/build/lib/main.js >>./nohup.log 2>&1 &
 echo "$(date "+%Y-%m-%d %H:%M:%S") 重启Appium完毕!"