test

python/main.py

@@ -16,7 +16,9 @@ print("1、编译apk")
 print("2、修改包名，版本号+1")
 print("3、创建新的签名文件")
 print("4、commit & push project")
-print("5、commit & push lib_base")
+print("5、pull lib_base & cash_plugin_toolbox")
+print("6、commit & push lib_base")
+print("8、提交一个渠道包Tag")
 print(" ")
 
 commod = int(input("请输入指令编号："))
@@ -33,5 +35,8 @@ elif commod == 4:
     Shell.push_project(config)
 
 elif commod == 5:
+    Shell.pull_base(config)
+    
+elif commod == 6:
     Shell.push_base(config)
     
\ No newline at end of file

python/shell.py

@@ -21,9 +21,28 @@ class Shell:
         commit_msg = input("输入commit msg:\n")
         command = "%s\n%s\n%s\n%s\n" \
             % (
-                "cd %s/%s"%(config['root'],"lib_base"),
+                "cd %s/%s" % (config['root'],"lib_base"),
                 "git add .",
                 "git commit -m \"%s\"" % commit_msg,
                 "git push origin master"
             )
         os.system(command)
+
+    #pull lib_base & cash_plugin_toolbox
+    @staticmethod
+    def pull_base(config):
+        command = "%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n" \
+            % (
+                "cd %s" % config['root'],
+                "git submodule update --remote",
+                "cd lib_base",
+                "git checkout master",
+                "git pull",
+                "cd ../cash_plugin_toolbox",
+                "git checkout master",
+                "git pull",
+                "cd ../lib_yitu || { echo \"lib_yitu not exist\"; exit 1; }",
+                "git checkout master",
+                "git pull"
+            )
+        os.system(command)