From fd40c8bcb481fd9a4e9ed1bfbe52d8fcdbda0a92 Mon Sep 17 00:00:00 2001
From: Frank Lu <frank.lu@akmii.com>
Date: Thu, 26 Jul 2018 14:46:46 +0800
Subject: [PATCH] Fix broker bash script: 1. seperate debug and release setting
 2. encode tag

---
 brokerRedirectPrint.sh | 39 ++++++++++++++++++++++++++++-----------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/brokerRedirectPrint.sh b/brokerRedirectPrint.sh
index e2001df95..08ca4fee3 100644
--- a/brokerRedirectPrint.sh
+++ b/brokerRedirectPrint.sh
@@ -14,9 +14,12 @@ java_bin=$JAVA_HOME/jre/bin
 keytool=$java_bin/keytool
 
 debug_key_store=$HOME/.android/debug.keystore
-release_alias="androiddebugkey"
-release_key_store=$HOME/.android/release.keystore
-release_password="android"
+debug_alias="androiddebugkey"
+debug_password="android"
+
+release_key_store=$HOME/.android/ms-release-key.keystore
+release_alias=""
+release_password=""
 android_key_store=
 
 usage() {
@@ -91,12 +94,30 @@ rawurlencode() {
   echo "${encoded}"    # You can either set a return variable (FASTER) 
   REPLY="${encoded}"   #+or echo the result (EASIER)... or both... :p
 }
+
+urlencode() {
+    # urlencode <string>
+    local length="${#1}"
+    for (( i = 0; i < length; i++ )); do
+        local c="${1:i:1}"
+        case $c in
+            [a-zA-Z0-9.~_-]) printf "$c" ;;
+            *) printf '%%%02X' "'$c"
+        esac
+    done
+}
 #---------------------------------
 
 #---------------------------------
 # Simple Func() to generate the hash from the certificate provided by the android keystore.
 makeTag() {
    tag=`$keytool -storepass $release_password -exportcert -alias $release_alias -keystore $android_key_store | openssl sha1 -binary |  openssl base64`
+   tag=$(urlencode $tag)
+}
+
+makeDebugTag() {
+   tag=`$keytool -storepass $debug_password -exportcert -alias $debug_alias -keystore $android_key_store | openssl sha1 -binary |  openssl base64`
+   tag=$(urlencode $tag)
 }
 #---------------------------------
 
@@ -140,11 +161,11 @@ makedebug() {
     
     echo "We are using the following values"
     printf "Package Name: %s\n" $package_name
-    printf "Keystore alias: %s\n" $release_alias
-    printf "Keystore password: %s\n" $release_password
+    printf "Keystore alias: %s\n" $debug_alias
+    printf "Keystore password: %s\n" $debug_password
     printf "Keystore: %s\n" $android_key_store
 
-    makeTag
+    makeDebugTag
     echo "Debug Redirect URI is:"
     makeReplyURL
 
@@ -170,8 +191,4 @@ if [ "$debug" = "1" ]; then
 fi
 if [ "$release" = "1" ]; then
     makerelease
-fi
-
-
-
-
+fi
\ No newline at end of file