diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4154dea..73e4724 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,8 +14,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, ubuntu-latest, macOS-latest] - java: [ '17' ] + os: [windows-latest, ubuntu-latest, macOS-13] + java: [ '21' ] fail-fast: false steps: # ____ _ __ __ ___ ____ __ @@ -85,7 +85,7 @@ jobs: if: matrix.os == 'ubuntu-latest' run: | mv releases/tokentool-*-1.x86_64.rpm releases/tokentool-${{ github.event.release.tag_name }}_x86_64.rpm - mv releases/tokentool_*-1_amd64.deb releases/tokentool_${{ github.event.release.tag_name }}_amd64.deb + if [ -e releases/tokentool_*1_amd64.deb ]; then mv releases/tokentool_*1_amd64.deb releases/tokentool_${{ github.event.release.tag_name }}_amd64.deb; fi - name: Upload Linux RPM Release Asset id: upload-release-asset-rpm uses: actions/upload-release-asset@v1 diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml index 48bca6b..e6d9c1b 100644 --- a/.github/workflows/verify-build.yml +++ b/.github/workflows/verify-build.yml @@ -22,8 +22,8 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [windows-latest, ubuntu-latest, macOS-latest] - java: [ '17' ] + os: [windows-latest, ubuntu-latest, macOS-13] + java: [ '21' ] fail-fast: false steps: - name: Git checkout diff --git a/build.gradle.kts b/build.gradle.kts index aa30ade..3f1c803 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,9 +3,9 @@ import java.time.LocalDateTime plugins { application java - id("org.openjfx.javafxplugin") version "0.0.13" - id("org.beryx.jlink") version "2.25.0" - id("com.diffplug.spotless") version "6.11.0" + id("org.openjfx.javafxplugin") version "0.0.14" + id("org.beryx.jlink") version "3.1.1" + id("com.diffplug.spotless") version "6.25.0" id("io.wusa.semver-git-plugin") version "2.3.7" } @@ -18,10 +18,12 @@ semver { initialVersion = "2.0.0" // (default) initial version in semantic versioning tagType = io.wusa.TagType.LIGHTWEIGHT - branches { // list of branch configurations + branches { + // list of branch configurations branch { incrementer = "NO_VERSION_INCREMENTER" // NO_VERSION_INCREMENTER, PATCH_INCREMENTER, MINOR_INCREMENTER, MAJOR_INCREMENTER, CONVENTIONAL_COMMITS_INCREMENTER - formatter = Transformer { info: io.wusa.Info -> "${info.version.major}.${info.version.minor}.${info.version.patch}" } + formatter = + Transformer { info: io.wusa.Info -> "${info.version.major}.${info.version.minor}.${info.version.patch}" } regex = ".+" // regex for the branch you want to configure, put this one last } } @@ -35,9 +37,15 @@ val environment: String by project // Custom properties ext { - val os = org.gradle.internal.os.OperatingSystem.current() - - if (semver.info.dirty || semver.info.version.toString().endsWith(semver.snapshotSuffix)) { + val os = + org.gradle.internal.os.OperatingSystem + .current() + + if (semver.info.dirty || + semver.info.version + .toString() + .endsWith(semver.snapshotSuffix) + ) { set("sentryDSN", "") set("environment", "Development") } else { @@ -61,19 +69,19 @@ application { } java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 modularity.inferModulePath.set(true) } javafx { - version = "17.0.2" + version = "21.0.6" modules = listOf("javafx.base", "javafx.controls", "javafx.fxml", "javafx.swing", "javafx.graphics") } spotless { java { - licenseHeaderFile("${projectDir}/spotless.license.java") + licenseHeaderFile("$projectDir/spotless.license.java") targetExclude("**/module-info.java") googleJavaFormat() } @@ -87,7 +95,6 @@ spotless { } } - // In this section you declare where to find the dependencies of your project repositories { mavenCentral() @@ -111,7 +118,7 @@ dependencies { implementation(group = "org.apache.pdfbox", name = "pdfbox", version = "2.0.27") // To decrypt password/secured PDFs - implementation(group = "org.bouncycastle", name = "bcmail-jdk15on", version = "1.70") + implementation(group = "org.bouncycastle", name = "bcmail-jdk18on", version = "1.80") // For pdf image extraction, specifically for jpeg2000 (jpx) support. implementation(group = "com.github.jai-imageio", name = "jai-imageio-core", version = "1.4.0") @@ -128,8 +135,9 @@ dependencies { implementation(group = "com.google.code.gson", name = "gson", version = "2.10") } -val sharedManifest = the().manifest { - attributes( +val sharedManifest = + the().manifest { + attributes( "Implementation-Title" to project.name, "Implementation-Version" to semver.info, "Implementation-Vendor" to vendor, @@ -140,20 +148,22 @@ val sharedManifest = the().manifest { "Built-JDK" to System.getProperty("java.version"), "Source-Compatibility" to project.java.sourceCompatibility, "Target-Compatibility" to project.java.targetCompatibility, - "Main-Class" to mainClassName - ) -} + "Main-Class" to mainClassName, + ) + } tasks.jar { - manifest = project.the().manifest { - from(sharedManifest) - } + manifest = + project.the().manifest { + from(sharedManifest) + } } tasks.register("uberJar") { - manifest = project.the().manifest { - from(sharedManifest) - } + manifest = + project.the().manifest { + from(sharedManifest) + } archiveClassifier.set("uber") @@ -172,11 +182,21 @@ tasks.register("uberJar") { jlink { // We need to keep the semver down to just major.minor.patch (no -alpha.1 or -rc.1, etc) otherwise jpackage fails val appVersion = "${semver.info.version.major}.${semver.info.version.minor}.${semver.info.version.patch}" - project.version = appVersion; - - options.set(listOf("--strip-debug", "--strip-native-commands", "--compress", "2", "--no-header-files", "--no-man-pages")) + project.version = appVersion + + options.set( + listOf( + "--strip-debug", + "--strip-native-commands", + "--compress", + "2", + "--no-header-files", + "--no-man-pages", + "--ignore-signing-information", + ), + ) - forceMerge("log4j-api", "gson") + forceMerge("log4j-api", "gson", "bcmail") launcher { name = "TokenTool" @@ -184,7 +204,9 @@ jlink { } jpackage { - val os = org.gradle.internal.os.OperatingSystem.current() + val os = + org.gradle.internal.os.OperatingSystem + .current() // not working :( // installerOutputDir = releaseDir // installerOutputDir = file("releases") @@ -195,25 +217,34 @@ jlink { imageName = "TokenTool" installerName = "TokenTool" - installerOptions = mutableListOf( + installerOptions = + mutableListOf( "--verbose", - "--description", project.description, - "--copyright", "Copyright 2000-2020 RPTools.net", - "--license-file", "package/license/COPYING.AFFERO", - "--app-version", appVersion, - "--vendor", vendor - ) + "--description", + project.description, + "--copyright", + "Copyright 2000-2020 RPTools.net", + "--license-file", + "package/license/COPYING.AFFERO", + "--app-version", + appVersion, + "--vendor", + vendor, + ) if (os.isWindows) { println("Setting Windows installer options") imageOptions.addAll(listOf("--icon", "package/windows/TokenTool.ico")) - installerOptions.addAll(listOf( + installerOptions.addAll( + listOf( "--win-dir-chooser", "--win-per-user-install", "--win-shortcut", "--win-menu", - "--win-menu-group", "RPTools" - )) + "--win-menu-group", + "RPTools", + ), + ) } if (os.isMacOsX) { @@ -224,21 +255,30 @@ jlink { if (os.isLinux) { println("Setting Linux installer options") imageOptions.addAll(listOf("--icon", "package/linux/tokentool.png")) - installerOptions.addAll(listOf( - "--linux-menu-group", "RPTools", - "--linux-shortcut") + installerOptions.addAll( + listOf( + "--linux-menu-group", + "RPTools", + "--linux-shortcut", + ), ) if (installerType == "deb") { - installerOptions.addAll(listOf( - "--linux-deb-maintainer", "admin@rptools.net" - )) + installerOptions.addAll( + listOf( + "--linux-deb-maintainer", + "admin@rptools.net", + ), + ) } if (installerType == "rpm") { - installerOptions.addAll(listOf( - "--linux-rpm-license-type", "AGPLv3" - )) + installerOptions.addAll( + listOf( + "--linux-rpm-license-type", + "AGPLv3", + ), + ) } } } @@ -250,27 +290,31 @@ tasks.register("generateBuildProperties") { } // A task that generates various dynamic properties used at runtime -open class GenerateBuildProperties @javax.inject.Inject constructor(objects: ObjectFactory) : DefaultTask() { - @OutputDirectory - val outputDir: DirectoryProperty = objects.directoryProperty() - - @TaskAction - fun compile() { - val dir = outputDir.get().asFile - val srcFile = File(dir, "build.properties") - logger.quiet("output dir = $dir") - - srcFile.writeText("# Auto-Generated properties from Gradle compileJava step\n") - srcFile.appendText("# ${LocalDateTime.now()}\n\n") - srcFile.appendText("version=${project.semver.info}\n") - srcFile.appendText("vendor=${project.ext["vendor"]}\n") - srcFile.appendText("environment=${project.ext["environment"]}\n") - srcFile.appendText("sentryDSN=${project.ext["sentryDSN"]}\n") - srcFile.appendText("git-commit=${project.semver.info.shortCommit}\n") - srcFile.appendText("git-commit-sha=${project.semver.info.commit}\n") +open class GenerateBuildProperties + @javax.inject.Inject + constructor( + objects: ObjectFactory, + ) : DefaultTask() { + @OutputDirectory + val outputDir: DirectoryProperty = objects.directoryProperty() + + @TaskAction + fun compile() { + val dir = outputDir.get().asFile + val srcFile = File(dir, "build.properties") + logger.quiet("output dir = $dir") + + srcFile.writeText("# Auto-Generated properties from Gradle compileJava step\n") + srcFile.appendText("# ${LocalDateTime.now()}\n\n") + srcFile.appendText("version=${project.semver.info}\n") + srcFile.appendText("vendor=${project.ext["vendor"]}\n") + srcFile.appendText("environment=${project.ext["environment"]}\n") + srcFile.appendText("sentryDSN=${project.ext["sentryDSN"]}\n") + srcFile.appendText("git-commit=${project.semver.info.shortCommit}\n") + srcFile.appendText("git-commit-sha=${project.semver.info.commit}\n") + } } -} tasks.getByName("distZip").enabled = false tasks.getByName("distTar").enabled = false -tasks.named("compileJava") { dependsOn("generateBuildProperties") } \ No newline at end of file +tasks.named("compileJava") { dependsOn("generateBuildProperties") } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..a4b76b9 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8fad3f5..d9fbee2 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-all.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 744e882..f3b75f3 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,69 +15,103 @@ # See the License for the specific language governing permissions and # limitations under the License. # +# SPDX-License-Identifier: Apache-2.0 +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MSYS* | MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." + fi fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. # For Cygwin or MSYS, switch paths to Windows format before running java -if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=`expr $i + 1` + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index ac1b06f..9b42019 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -13,8 +13,10 @@ @rem See the License for the specific language governing permissions and @rem limitations under the License. @rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +27,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +43,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 goto fail @@ -75,13 +78,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal