Commit 2b905422 by sikang

bug fix

parent 2c113735
...@@ -84,16 +84,13 @@ elif command == 8: ...@@ -84,16 +84,13 @@ elif command == 8:
elif command == 21: elif command == 21:
#每行一个shell命令,参考自行修改 #每行一个shell命令,参考自行修改
command = "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n" \ command = "%s\n%s\n%s\n%s\n%s\n%s\n" \
% ( % (
"cd %s" % config['root'], "cd %s" % config['root'],
"git checkout . && git clean -df", "git checkout . && git clean -df",
"git reset --hard origin/%s" % config['git_branch'], "git reset --hard origin/%s" % config['git_branch'],
"cd lib_base || { echo \"lib_base not exist!\"; exit 1; }", "cd lib_base || { echo \"lib_base not exist!\"; exit 1; }",
"git checkout . && git clean -df", "git checkout . && git clean -df",
"git reset --hard origin/master",
"cd ../cash_plugin_toolbox",
"git checkout . && git clean -df",
"git reset --hard origin/master" "git reset --hard origin/master"
) )
os.system(command) os.system(command)
......
...@@ -35,7 +35,7 @@ print("1、编译apk") ...@@ -35,7 +35,7 @@ print("1、编译apk")
print("2、修改包名,版本号+1") print("2、修改包名,版本号+1")
print("3、创建新的签名文件") print("3、创建新的签名文件")
print("4、commit & push project") print("4、commit & push project")
print("5、pull lib_base & cash_plugin_toolbox") print("5、pull lib_base")
print("6、commit & push lib_base") print("6、commit & push lib_base")
print("7、获取签名秘钥散列") print("7、获取签名秘钥散列")
print("8、提交一个渠道包Tag") print("8、提交一个渠道包Tag")
......
...@@ -40,18 +40,15 @@ class Shell: ...@@ -40,18 +40,15 @@ class Shell:
) )
os.system(command) os.system(command)
# pull lib_base & cash_plugin_toolbox # pull lib_base
def pull_base(self, config): def pull_base(self, config):
command = "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n" \ command = "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n" \
% ( % (
"cd %s" % config['root'], "cd %s" % config['root'],
"git submodule update --remote", "git submodule update --remote",
"cd lib_base", "cd lib_base",
"git checkout master", "git checkout master",
"git pull", "git pull",
"cd ../cash_plugin_toolbox",
"git checkout master",
"git pull",
"cd ../lib_yitu || { echo \"lib_yitu not exist\"; exit 1; }", "cd ../lib_yitu || { echo \"lib_yitu not exist\"; exit 1; }",
"git checkout master", "git checkout master",
"git pull" "git pull"
...@@ -96,16 +93,13 @@ class Shell: ...@@ -96,16 +93,13 @@ class Shell:
# reset project # reset project
def reset_project(self, config): def reset_project(self, config):
command = "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n" \ command = "%s\n%s\n%s\n%s\n%s\n%s\n" \
% ( % (
"cd %s" % config['root'], "cd %s" % config['root'],
"git checkout . && git clean -df", "git checkout . && git clean -df",
"git reset --hard origin/%s" % config['git_branch'], "git reset --hard origin/%s" % config['git_branch'],
"cd lib_base || { echo \"lib_base not exist!\"; exit 1; }", "cd lib_base || { echo \"lib_base not exist!\"; exit 1; }",
"git checkout . && git clean -df", "git checkout . && git clean -df",
"git reset --hard origin/master",
"cd ../cash_plugin_toolbox",
"git checkout . && git clean -df",
"git reset --hard origin/master" "git reset --hard origin/master"
) )
os.system(command) os.system(command)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment