update script

script/create_keystore.py → script/backup/create_keystore.py

@@ -291,6 +291,7 @@ from properties_reader import Reader
 reader = Reader('../../gradle.properties')
 jvmargs = reader.get('org.gradle.jvmargs')
 git_branch = reader.get('git_branch')
+apk_channels = reader.get('apk_channels')
 
 print (
     'enter the new keystore name (last version : ' + reader.get('signing_keyAlias') + ') ', " ")
@@ -307,6 +308,7 @@ print ('ready to create new kestore ' + keyName)
 properties = Properties()
 properties['org.gradle.jvmargs'] = jvmargs
 properties['git_branch'] = git_branch
+properties['apk_channels'] = apk_channels
 properties['signing_keyAlias'] = keyName
 properties['signing_certificate'] = '../jks/' + keyName + '.keystore'
 properties['signging_certificatePassword'] = keyName

script/creat_keystore.sh

+#!/usr/bin/env bash
+cd ../../
+. gradle.properties
+echo -n "enter the new keystore name (last version :${signing_keyAlias}) : "
+read newKeyName
+
+#输入 v** 直接改版本号，否则修改全名
+if [[ ${newKeyName:0:1} = 'v' ]]
+then
+    oldIFS=$IFS
+    IFS=_
+    array=(${signing_keyAlias})
+    alias="${array[0]}_${newKeyName}"
+else
+    alias=${newKeyName}
+fi
+
+certificate="../jks/${alias}.keystore"
+certificatePassword=${alias}
+storePassword=${alias}
+
+sed -i "" "s#^signing_keyAlias=.*#signing_keyAlias=${alias}#g"  gradle.properties
+sed -i "" "s#^signing_certificate=.*#signing_certificate=${certificate}#g"  gradle.properties
+sed -i "" "s#^signging_certificatePassword=.*#signging_certificatePassword=${certificatePassword}#g"  gradle.properties
+sed -i "" "s#^signging_storePassword=.*#signging_storePassword=${storePassword}#g"  gradle.properties
+
+echo "ready to create new kestore ${alias}"
+keytool -genkey -alias "${alias}" -keyalg RSA -validity 20000 -keystore jks/"${alias}".keystore
\ No newline at end of file

script/make_channel.sh

@@ -7,7 +7,8 @@ cd lib_base/script/
 
 if [[ -z ${channels} ]]
 then
-    java -jar walle-cli-all.jar batch -f ../../script/channels ../../resGuardApks/"${project_name}"_release.apk
+    source ./../../gradle.properties
+    java -jar walle-cli-all.jar batch -c ${apk_channels} ../../resGuardApks/"${project_name}"_release.apk
 else
     java -jar walle-cli-all.jar batch -c "${channels}" ../../resGuardApks/"${project_name}"_release.apk
 fi
\ No newline at end of file

script/module_push.sh

-cd ..
+#!/usr/bin/env bash
 echo -n  "commit message:  "
 read message
 if((${#message}==0))
@@ -7,8 +7,8 @@ then
     cd script
     ./module_push.sh
 else
-    . ../../gradle.properties
-    git_branch=git_branch
+    cd ../../
+    source ./gradle.properties
     git add .
     git commit -m "${message}"
     git push origin ${git_branch}

script/script_help.sh

@@ -21,8 +21,8 @@ then
 
 elif (($commod == '2'))
 then
-    ./create_keystore.py
-
+#    ./create_keystore.py
+    ./creat_keystore.sh
 elif (($commod == '3'))
 then
     ./base_push.sh