- Timestamp:
- 2022-06-23T00:07:10+02:00 (2 years ago)
- Location:
- trunk/native/linux
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/native/linux/latest/usr/bin/josm-latest
r18497 r18498 1 #!/usr/bin/ bash1 #!/usr/bin/env bash 2 2 # Simple wrapper script used to start JOSM in Debian 3 set -e 3 set -ex 4 4 5 5 # First, the alternative (if known to work) or users preference as defined by $JAVA_HOME. Next, use OpenJDK. … … 37 37 } 38 38 39 java_version() { 40 ${1} -version 2>&1 | head -n1 | awk '{print $3}' | awk -F'.' '{gsub(/"/, ""); print $1}' | cat 41 } 42 39 43 if [ -x "$(command -v dpkg)" ]; then 40 44 dpkg_java … … 70 74 if [ "$JAVACMD" ]; then 71 75 echo "Using $JAVACMD to execute ${JOSM_VERSION}." || true 72 JAVA_VERSION= "$(${JAVACMD} -version 2>&1 | head -n1 | awk '{print $3}' | awk -F'.' '{gsub(/"/, ""); print $1}')"76 JAVA_VERSION=$(java_version ${JAVACMD}) 73 77 JAVAFX_HOME="${JAVAFX_HOME:-/usr/share/openjfx/lib}" 74 78 JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}" -
trunk/native/linux/tested/usr/bin/josm
r18497 r18498 37 37 } 38 38 39 java_version() { 40 ${1} -version 2>&1 | head -n1 | awk '{print $3}' | awk -F'.' '{gsub(/"/, ""); print $1}' | cat 41 } 42 39 43 if [ -x "$(command -v dpkg)" ]; then 40 44 dpkg_java … … 70 74 if [ "$JAVACMD" ]; then 71 75 echo "Using $JAVACMD to execute ${JOSM_VERSION}." || true 72 JAVA_VERSION= "$(${JAVACMD} -version 2>&1 | head -n1 | awk '{print $3}' | awk -F'.' '{gsub(/"/, ""); print $1}')"76 JAVA_VERSION=$(java_version ${JAVACMD}) 73 77 JAVAFX_HOME="${JAVAFX_HOME:-/usr/share/openjfx/lib}" 74 78 JOSM_PATH="${JOSM_PATH:-/usr/share/${JOSM_VERSION}/${JOSM_VERSION}.jar}"
Note:
See TracChangeset
for help on using the changeset viewer.