Travis CI script touch-ups

Author: mannodermaus

.travis.yml

@@ -33,7 +33,7 @@ before_install:
 install:
   - ./gradlew clean assemble assembleAndroidTest --stacktrace
 
-before_script:
+#before_script:
 #  - android-wait-for-emulator
 #  - adb shell input keyevent 82
 
@@ -44,21 +44,21 @@ after_success:
   - ./scripts/deploy_snapshot.sh
 
 deploy:
-  skip_cleanup: true
     # Deploy Gradle plugin on tagged commits
     # starting with the marker "plugin-<version>"
   - provider: script
     script: ./scripts/deploy_plugin_release.sh
+    skip_cleanup: true
     on:
       tags: true
-      condition: "${TRAVIS_TAG/plugin-}" != "$TRAVIS_TAG"
+      condition: "\"${TRAVIS_TAG/plugin-}\" != \"$TRAVIS_TAG\""
     # Deploy Instrumentation library on tagged commits
     # starting with the marker "instrumentation-<version>"
   - provider: script
     script: ./scripts/deploy_instrumentation_release.sh
+    skip_cleanup: true
     on:
-      tags: true
-      condition: "${TRAVIS_TAG/instrumentation-}" != "$TRAVIS_TAG"
+      condition: "\"${TRAVIS_TAG/instrumentation-}\" != \"$TRAVIS_TAG\""
 
 notifications:
   email: false