|
@@ -11,9 +11,9 @@ normal="\e[0m"
|
|
|
|
|
|
|
|
echo -e "\n"
|
|
echo -e "\n"
|
|
|
echo -e "${green}>>> 1: 开始从服务器更新代码${normal}"
|
|
echo -e "${green}>>> 1: 开始从服务器更新代码${normal}"
|
|
|
-git reset --hard origin/master
|
|
|
|
|
-git checkout master
|
|
|
|
|
-git pull origin master
|
|
|
|
|
|
|
+git reset --hard origin/main
|
|
|
|
|
+git checkout main
|
|
|
|
|
+git pull origin main
|
|
|
if [ $? -eq 0 ];then
|
|
if [ $? -eq 0 ];then
|
|
|
echo -e "${green}更新代码完成,准备编译代码...${normal}"
|
|
echo -e "${green}更新代码完成,准备编译代码...${normal}"
|
|
|
else
|
|
else
|