Updated scripts

Author: stealthcopter

scripts/config.sh

@@ -1,23 +1,13 @@
 #!/usr/bin/env bash
 ENV_VAR_PREFIX="ANDROID_NETWORK_TOOLS"
 
-APP_NAME="Android Network Tools Sample App"
-
 # Slack webhook settings
 SLACK_CHANNEL="#mat-testing"
 SLACK_WEBHOOK_URL="https://hooks.slack.com/services/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"
 ICON_URL="https://github.com/stealthcopter/AndroidNetworkTools/raw/master/app/src/main/res/mipmap-xhdpi/ic_launcher.png"
 
-# Settings for github releases
-GITHUB_RELEASE_MODULE="library"
-GITHUB_RELEASE_DESC="This release was automatically generated by the CI server"
-GITHUB_RELEASE_URL="https://api.github.com/repos/stealthcopter/AndroidNetworkTools/releases"
-GITHUB_RELEASE_TOKEN=$ANDROID_NETWORK_TOOLS_GITHUB_RELEASE_TOKEN
-GITHUB_RELEASE_FILE_PATH="app/build/outputs/apk/app-regular-release.apk"
-GITHUB_RELASE_FILENAME="AndroidNetworkTools.apk"
-GITHUB_UPLOAD_URL="https://uploads.github.com/repos/stealthcopter/AndroidNetworkTools/releases/"
-
 # Git info
+GIT_URL="https://github.com/stealthcopter/AndroidNetworkTools"
 GIT_TAG=`git name-rev --name-only --tags HEAD`
 GIT_COMMIT_DESC=`git log -n 1 $CIRCLE_SHA1`
 GIT_CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
@@ -26,15 +16,14 @@ GIT_CURRENT_BRANCH=`git rev-parse --abbrev-ref HEAD`
 function webhook {
 
     gradle_app_name="$1"
-    message="$2"
+    app_name="$2"
+    message="$3"
     git_hash=`git rev-parse --short HEAD`
     version=`cat ${gradle_app_name}/build.gradle | grep -m 1 versionName | cut -d'"' -f 2`
 
-    # TESTING WEBHOOK https://hooks.slack.com/services/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
-    
     echo $message
-    echo $channel $gradle_app_name $APP_NAME $version $ICON_URL
+    echo $channel $gradle_app_name $app_name $version $ICON_URL
 
-    curl -X POST --data-urlencode 'payload={"channel": "'"$SLACK_CHANNEL"'", "username": "CirclCI Deployment Bot", "text": "*'"$APP_NAME"'* version *'"$version"'*  <'"https://github.com/scottyab/rootbeer/commits/$git_hash"'|'"$git_hash"'> '"$message"'", "icon_url": "'"$ICON_URL"'"}' $SLACK_WEBHOOK_URL
+    curl -X POST --data-urlencode 'payload={"channel": "'"$SLACK_CHANNEL"'", "username": "CirclCI Deployment Bot", "text": "*'"$app_name"'* version *'"$version"'*  <'"$GIT_URL/commits/$git_hash"'|'"$git_hash"'> '"$message"'", "icon_url": "'"$ICON_URL"'"}' $SLACK_WEBHOOK_URL
 
 }  

scripts/github-release.sh

@@ -5,7 +5,16 @@ DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
 . "$DIR/config.sh"
 
+# Settings for github releases
 
+GITHUB_RELEASE_NAME="Android Network Tools Library"
+GITHUB_RELEASE_MODULE="library"
+GITHUB_RELEASE_DESC="This release was automatically generated by the CI server"
+GITHUB_RELEASE_URL="https://api.github.com/repos/stealthcopter/AndroidNetworkTools/releases"
+GITHUB_RELEASE_TOKEN=$ANDROID_NETWORK_TOOLS_GITHUB_RELEASE_TOKEN
+GITHUB_RELEASE_FILE_PATH="app/build/outputs/apk/app-regular-release.apk"
+GITHUB_RELASE_FILENAME="AndroidNetworkTools.apk"
+GITHUB_UPLOAD_URL="https://uploads.github.com/repos/stealthcopter/AndroidNetworkTools/releases/"
 
 function create_github_release { 
 
@@ -25,7 +34,7 @@ function create_github_release {
 
     echo "Found id $id"
 
-    curl -v -H "Content-Type:application/zip" -H "Authorization: token $GITHUB_RELEASE_TOKEN" --data-binary @"$GITHUB_RELEASE_FILE_PATH" $GITHUB_UPLOAD_URL$id/assets?name=$GITHUB_RELASE_FILENAME
+    curl -H "Content-Type:application/zip" -H "Authorization: token $GITHUB_RELEASE_TOKEN" --data-binary @"$GITHUB_RELEASE_FILE_PATH" $GITHUB_UPLOAD_URL$id/assets?name=$GITHUB_RELASE_FILENAME
 
     return
 }
@@ -43,8 +52,8 @@ function create_github_release {
 if [[ $GIT_COMMIT_DESC != *"undefined"* ]]; then
     echo "Creating github release for tag $GIT_TAG"
     if create_github_release $GITHUB_RELEASE_MODULE; then
-        webhook $GITHUB_RELEASE_MODULE "Created github release for tag $TAG"
+        webhook $GITHUB_RELEASE_MODULE $GITHUB_RELEASE_NAME "Created github release for tag $TAG"
     else
-        webhook $GITHUB_RELEASE_MODULE "Failed to create github release for tag $TAG :("
+        webhook $GITHUB_RELEASE_MODULE $GITHUB_RELEASE_NAME "Failed to create github release for tag $TAG :("
     fi
 fi

scripts/upload-apks.sh

@@ -5,16 +5,16 @@ DIR="${BASH_SOURCE%/*}"
 if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
 . "$DIR/config.sh"
 
-
+APP_RELEASE_NAME="Android Network Tools Sample App"
 
 # Uploads a build to Beta
 function upload_to_beta {
     echo "Uploading $1 to Beta"
 
     if ./gradlew :$1:crashlyticsUploadDistributionRelease ; then
-        webhook "${1}" "Uploading to Beta Succeeded"
+        webhook $1 $APP_RELEASE_NAME "Uploading to Beta Succeeded"
     else
-        webhook "${1}" "Uploading to Beta Play FAILED :("
+        webhook $1 $APP_RELEASE_NAME "Uploading to Beta Play FAILED :("
     fi
 }
 
@@ -23,9 +23,9 @@ function upload_to_google_play {
     echo "Uploading $1 to Google Play"
 
     if ./gradlew :$1:publishApkRegularRelease ; then
-        webhook "${1}" "Uploading to Google Play Succeeded"
+        webhook $1 $APP_RELEASE_NAME "Uploading to Google Play Succeeded"
     else
-        webhook "${1}" "Uploading to Google Play FAILED :("
+        webhook $1 $APP_RELEASE_NAME "Uploading to Google Play FAILED :("
     fi
 }