aboutsummaryrefslogtreecommitdiffstats
path: root/gradlew
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2016-04-12 19:28:00 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2016-04-12 19:28:00 +0200
commit115c46d015bbbbcf6223d3e13844daa98d12255c (patch)
treeb314acca775605ba8b0fbb6da1994d30fa032416 /gradlew
parent060a5a1815aa4eaaa4df0a50245070acbcdd9eff (diff)
downloadopen-keychain-115c46d015bbbbcf6223d3e13844daa98d12255c.tar.gz
open-keychain-115c46d015bbbbcf6223d3e13844daa98d12255c.tar.bz2
open-keychain-115c46d015bbbbcf6223d3e13844daa98d12255c.zip
Update Android Gradle Plugin to 2.0 with workarounds
Diffstat (limited to 'gradlew')
-rwxr-xr-xgradlew10
1 files changed, 3 insertions, 7 deletions
diff --git a/gradlew b/gradlew
index 91a7e269e..9d82f7891 100755
--- a/gradlew
+++ b/gradlew
@@ -42,11 +42,6 @@ case "`uname`" in
;;
esac
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
@@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -114,6 +109,7 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`