update script

script/create_keystore.py

@@ -287,53 +287,26 @@ class Properties(object):
                 return getattr(self._props, name)
 
 
-class Reader:
-
-    def __init__(self, file_name):
-        self.file_name = file_name
-        self.properties = {}
-        try:
-            fopen = open(self.file_name, 'r')
-            for line in fopen:
-                line = line.strip()
-                if line.find('=') > 0 and not line.startswith('#'):
-                    strs = line.split('=')
-                    self.properties[strs[0].strip()] = strs[1].strip()
-        except ValueError:
-            raise e
-        else:
-            fopen.close()
-
-    def has_key(self, key):
-        return key in self.properties
-
-    def get(self, key, default_value=''):
-        if key in self.properties:
-            return self.properties[key]
-        return default_value
-
-    def put(self, key, value):
-        self.properties[key] = value
-        replace_property(self.file_name, key + '=.*', key + '=' + value, True)
-
-
-
-
+from properties_reader import Reader
 reader = Reader('../../gradle.properties')
+jvmargs = reader.get('org.gradle.jvmargs')
+git_branch = reader.get('git_branch')
+
 print (
     'enter the new keystore name (last version : ' + reader.get('signing_keyAlias') + ') ', " ")
 # 输入签名版本
-keyName = os.popen('sh  keystore_version.sh').read().replace('\n','')
+keyName = os.popen('sh  keystore_version.sh').read().replace('\n', '')
 
 # 输入 v* 直接更改版本号,否则改文件名
 if keyName.startswith('v'):
     keyName = reader.get('signing_keyAlias').split('_')[0] + '_' + keyName
 
-print ('ready to create new kestore '+keyName)
+print ('ready to create new kestore ' + keyName)
 
 # 修改gradle.properties
 properties = Properties()
-properties['org.gradle.jvmargs'] = '-Xmx1536m'
+properties['org.gradle.jvmargs'] = jvmargs
+properties['git_branch'] = git_branch
 properties['signing_keyAlias'] = keyName
 properties['signing_certificate'] = '../jks/' + keyName + '.keystore'
 properties['signging_certificatePassword'] = keyName
@@ -341,4 +314,5 @@ properties['signging_storePassword'] = keyName
 properties.store(open('../../gradle.properties', 'w'))
 
 # 生成签名
-os.system('keytool -genkey -alias ' + keyName + ' -keyalg RSA -validity 20000 -keystore ../../jks/'+keyName+'.keystore')
+os.system(
+    'keytool -genkey -alias ' + keyName + ' -keyalg RSA -validity 20000 -keystore ../../jks/' + keyName + '.keystore')

script/module_push.sh

+cd ..
+echo -n  "commit message:  "
+read message
+if((${#message}==0))
+then
+    echo "message can not be null !"
+    cd script
+    ./module_push.sh
+else
+    git add .
+    git commit -m "${message}"
+    . pom.properties
+    git_branch=git_branch
+    git push origin ${git_branch}
+fi
+

script/properties_reader.py

+class Reader:
+
+    def __init__(self, file_name):
+        self.file_name = file_name
+        self.properties = {}
+        try:
+            fopen = open(self.file_name, 'r')
+            for line in fopen:
+                line = line.strip()
+                if line.find('=') > 0 and not line.startswith('#'):
+                    strs = line.split('=')
+                    self.properties[strs[0].strip()] = strs[1].strip()
+        except ValueError:
+            raise e
+        else:
+            fopen.close()
+
+    def has_key(self, key):
+        return key in self.properties
+
+    def get(self, key, default_value=''):
+        if key in self.properties:
+            return self.properties[key]
+        return default_value
+
+    def put(self, key, value):
+        self.properties[key] = value
+        replace_property(self.file_name, key + '=.*', key + '=' + value, True)
\ No newline at end of file

script/script_help.sh

@@ -29,7 +29,6 @@ then
 
 elif (($commod == '4'))
 then
-    cd ../../script
     ./module_push.sh
 
 elif (($commod == '5'))