Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-45287] Use type -p java instead of which java
  • Loading branch information
Raul Arabaolaza committed Jul 11, 2017
1 parent cc184e1 commit df59db8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
3 changes: 0 additions & 3 deletions deb/build/debian/jenkins.default
Expand Up @@ -3,9 +3,6 @@
# pulled in from the init script; makes things easier.
NAME=@@ARTIFACTNAME@@

# location of java
JAVA=$(which java)

# arguments to pass to java

# Allow graphs etc. to work even when an X server is present
Expand Down
1 change: 1 addition & 0 deletions deb/build/debian/jenkins.init
Expand Up @@ -24,6 +24,7 @@ SCRIPTNAME=/etc/init.d/$NAME
#DAEMON=$JENKINS_SH
DAEMON=/usr/bin/daemon
DAEMON_ARGS="--name=$NAME --inherit --env=JENKINS_HOME=$JENKINS_HOME --output=$JENKINS_LOG --pidfile=$PIDFILE"
JAVA=`type -p java`

JAVA_ALLOWED_VERSION="18"

Expand Down

0 comments on commit df59db8

Please sign in to comment.