Merge branch 'travis-ci'

# Conflicts:
#	.travis.yml

.travis.yml

@@ -38,39 +38,40 @@ env:
     - DOCKER_IMAGES="centos:centos6 centos:centos7 debian:wheezy debian:jessie ubuntu:trusty opensuse:latest base/arch:latest"
   matrix:
     - ENV_TEST_FILE="openjdk-12_jdk"
-#    - ENV_TEST_FILE="openjdk-11_jdk"
-#    - ENV_TEST_FILE="openjdk-10_jdk"
-#    - ENV_TEST_FILE="openjdk-8_jdk"
-#    - ENV_TEST_FILE="oracle-11_jdk"
-#    - ENV_TEST_FILE="oracle-10_jdk"
-#    - ENV_TEST_FILE="oracle-9_jdk"
-#    - ENV_TEST_FILE="oracle-9.0.1_jdk"
-#    - ENV_TEST_FILE="oracle-8_jdk"
-#    - ENV_TEST_FILE="oracle-8u171_jdk"
-#    - ENV_TEST_FILE="oracle-1.8.0_171_jdk"
-#    - ENV_TEST_FILE="oracle-1.8.0_171-b11_jdk"
-#    - ENV_TEST_FILE="oracle-8u144_jdk"
+    - ENV_TEST_FILE="openjdk-11_jdk"
+    - ENV_TEST_FILE="openjdk-10_jdk"
+    - ENV_TEST_FILE="openjdk-8_jdk"
+    - ENV_TEST_FILE="oracle-11_jdk"
+    - ENV_TEST_FILE="oracle-10_jdk"
+    - ENV_TEST_FILE="oracle-9_jdk"
+    - ENV_TEST_FILE="oracle-9.0.1_jdk"
+    - ENV_TEST_FILE="oracle-8_jdk"
+    - ENV_TEST_FILE="oracle-8u171_jdk"
+    - ENV_TEST_FILE="oracle-1.8.0_171_jdk"
+    - ENV_TEST_FILE="oracle-1.8.0_171-b11_jdk"
+    - ENV_TEST_FILE="oracle-8u144_jdk"
 
-jobs:
-  include:
-    - stage: before_deploy
-      env:
-        - DOCKER_IMAGES=""   ENV_TEST_FILE="oracle-"
-        - RELEASE_NUMBER=`date +%Y%m%d_%H%M%S`
-      script:
-        - ./src/main/bash/builder.bash && cp ./build/jvmw ./ || travis_terminate 1
-        - git config --local user.name "Victor Alenkov"
-        - git config --local user.email "[email protected]"
-        - git commit -a -m "Release $RELEASE_NUMBER"
-        - git tag "$RELEASE_NUMBER"
-        - git remote add deploy "https://[email protected]/$TRAVIS_REPO_SLUG.git"
-        - git push deploy --tags &>/dev/null
-
-    - stage: deploy
-      skip_cleanup: true
-      provider: releases
-      api_key: "$GITHUB_TOKEN"
-      overwrite: true
-      files: ./jvmw
-      env:
-        - DOCKER_IMAGES=""   ENV_TEST_FILE="oracle-"
+#jobs:
+#  include:
+#    - stage: before_deploy
+#      env:
+#        - DOCKER_IMAGES=""   ENV_TEST_FILE="oracle-"
+#        - RELEASE_NUMBER=`date +%Y%m%d_%H%M%S`
+#      script:
+#        - git config --global user.name "TravisCI"
+#        - git config --global user.email "[email protected]"
+#        - git remote add deploy "https://TravisCI:[email protected]/$TRAVIS_REPO_SLUG.git"
+#        - ./src/main/bash/builder.bash && cp ./build/jvmw ./
+#        - git commit -a -m "Release $RELEASE_NUMBER"
+#        - git tag "$RELEASE_NUMBER"
+#
+#    - stage: deploy
+#      skip_cleanup: true
+#      provider: releases
+#      api_key: "$GITHUB_TOKEN"
+#      files:
+#        - "jvmw"
+#      on:
+#        tags: true
+#      env:
+#        - DOCKER_IMAGES=""   ENV_TEST_FILE="oracle-"

jvmw

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Build date: 20181014_011932
+# Build date: 20181119_065300
 #
 # Hack for code verification
 JVM_VERSION_MAJOR=${JVM_VERSION_MAJOR}
@@ -537,7 +537,7 @@ else
 	system_check_program_exists "${REQUIRED_COMMANDS_CORE}" "${REQUIRED_COMMANDS_LINUX}"
 fi
 if [[ "$1" == "upgrade" ]]; then
-	curl -sS https://raw.githubusercontent.com/itbasis/jvm-wrapper/master/jvmw >"$0"
+	curl -sS https://raw.githubusercontent.com/itbasis/jvm-wrapper/master/jvmw >"$0" && chmod u+x "$0"
 	exit 0
 fi
 main_properties