Browse Source

Unset JENV_OPTIONS in all cases, so "jenv info" will not claim the options

will be added to the command line.
pull/11/head
Frank Pavageau 13 years ago
parent
commit
4597039517
  1. 2
      plugins/ant/etc/jenv.d/exec/ant-before.bash
  2. 2
      plugins/gradle/etc/jenv.d/exec/gradle-before.bash
  3. 2
      plugins/maven/etc/jenv.d/exec/maven-before.bash
  4. 2
      plugins/sbt/etc/jenv.d/exec/sbt-before.bash

2
plugins/ant/etc/jenv.d/exec/ant-before.bash

@ -2,9 +2,9 @@ if [ "$1" = "ant" ]; then @@ -2,9 +2,9 @@ if [ "$1" = "ant" ]; then
if [ -n "$JENV_OPTIONS" ]; then
if [ -z "$ANT_OPTS" ]; then
exportVariable ANT_OPTS $JENV_OPTIONS
unset JENV_OPTIONS
else
echo "ANT_OPTS is set and not overridden by jenv" >&2
fi
unset JENV_OPTIONS
fi
fi

2
plugins/gradle/etc/jenv.d/exec/gradle-before.bash

@ -2,9 +2,9 @@ if [ "$1" = "gradle" ]; then @@ -2,9 +2,9 @@ if [ "$1" = "gradle" ]; then
if [ -n "$JENV_OPTIONS" ]; then
if [ -z "$GRADLE_OPTS" ]; then
exportVariable GRADLE_OPTS $JENV_OPTIONS
unset JENV_OPTIONS
else
echo "GRADLE_OPTS is set and not overridden by jenv" >&2
fi
unset JENV_OPTIONS
fi
fi

2
plugins/maven/etc/jenv.d/exec/maven-before.bash

@ -2,9 +2,9 @@ if [ "$1" = "mvn" ]; then @@ -2,9 +2,9 @@ if [ "$1" = "mvn" ]; then
if [ -n "$JENV_OPTIONS" ]; then
if [ -z "$MAVEN_OPTS" ]; then
exportVariable MAVEN_OPTS $JENV_OPTIONS
unset JENV_OPTIONS
else
echo "MAVEN_OPTS is set and not overridden by jenv" >&2
fi
unset JENV_OPTIONS
fi
fi

2
plugins/sbt/etc/jenv.d/exec/sbt-before.bash

@ -2,9 +2,9 @@ if [ "$1" = "sbt" ]; then @@ -2,9 +2,9 @@ if [ "$1" = "sbt" ]; then
if [ -n "$JENV_OPTIONS" ]; then
if [ -z "$SBT_OPTS" ]; then
exportVariable SBT_OPTS $JENV_OPTIONS
unset JENV_OPTIONS
else
echo "SBT_OPTS is set and not overridden by jenv" >&2
fi
unset JENV_OPTIONS
fi
fi

Loading…
Cancel
Save