From 1573aba1ab4f94697253a980ae1120f5f0faee8d Mon Sep 17 00:00:00 2001 From: Istvan Gansperger Date: Thu, 22 Aug 2024 18:05:15 +0200 Subject: [PATCH 1/5] Add bash and ash tests for the -jvm-debug and -h flags --- src/sbt-test/ash/script-debug/build.sbt | 17 ++++++++++++ .../ash/script-debug/project/build.properties | 1 + .../ash/script-debug/project/plugins.sbt | 1 + .../script-debug/src/main/scala/MainApp.scala | 3 +++ src/sbt-test/ash/script-debug/test | 4 +++ src/sbt-test/ash/script-help/build.sbt | 26 +++++++++++++++++++ .../ash/script-help/project/build.properties | 1 + .../ash/script-help/project/plugins.sbt | 1 + .../script-help/src/main/scala/MainApp.scala | 3 +++ src/sbt-test/ash/script-help/test | 4 +++ src/sbt-test/bash/script-debug/build.sbt | 17 ++++++++++++ .../script-debug/project/build.properties | 1 + .../bash/script-debug/project/plugins.sbt | 1 + .../script-debug/src/main/scala/MainApp.scala | 3 +++ src/sbt-test/bash/script-debug/test | 4 +++ src/sbt-test/bash/script-help/build.sbt | 26 +++++++++++++++++++ .../bash/script-help/project/build.properties | 1 + .../bash/script-help/project/plugins.sbt | 1 + .../script-help/src/main/scala/MainApp.scala | 3 +++ src/sbt-test/bash/script-help/test | 4 +++ 20 files changed, 122 insertions(+) create mode 100644 src/sbt-test/ash/script-debug/build.sbt create mode 100644 src/sbt-test/ash/script-debug/project/build.properties create mode 100644 src/sbt-test/ash/script-debug/project/plugins.sbt create mode 100644 src/sbt-test/ash/script-debug/src/main/scala/MainApp.scala create mode 100644 src/sbt-test/ash/script-debug/test create mode 100644 src/sbt-test/ash/script-help/build.sbt create mode 100644 src/sbt-test/ash/script-help/project/build.properties create mode 100644 src/sbt-test/ash/script-help/project/plugins.sbt create mode 100644 src/sbt-test/ash/script-help/src/main/scala/MainApp.scala create mode 100644 src/sbt-test/ash/script-help/test create mode 100644 src/sbt-test/bash/script-debug/build.sbt create mode 100644 src/sbt-test/bash/script-debug/project/build.properties create mode 100644 src/sbt-test/bash/script-debug/project/plugins.sbt create mode 100644 src/sbt-test/bash/script-debug/src/main/scala/MainApp.scala create mode 100644 src/sbt-test/bash/script-debug/test create mode 100644 src/sbt-test/bash/script-help/build.sbt create mode 100644 src/sbt-test/bash/script-help/project/build.properties create mode 100644 src/sbt-test/bash/script-help/project/plugins.sbt create mode 100644 src/sbt-test/bash/script-help/src/main/scala/MainApp.scala create mode 100644 src/sbt-test/bash/script-help/test diff --git a/src/sbt-test/ash/script-debug/build.sbt b/src/sbt-test/ash/script-debug/build.sbt new file mode 100644 index 000000000..dbb68e1ea --- /dev/null +++ b/src/sbt-test/ash/script-debug/build.sbt @@ -0,0 +1,17 @@ +import java.net.ServerSocket + +enablePlugins(JavaAppPackaging, AshScriptPlugin) + +name := "script-debug" + +version := "0.1.0" + +TaskKey[Unit]("runCheck") := { + val cwd = (stagingDirectory in Universal).value + val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath, "-jvm-debug", "0") + val output = (sys.process.Process(cmd, cwd).!!).replaceAll("\n", "") + + assert(output.contains("Listening for transport dt_socket at address:"), + "Application did not start in debug mode: \n" + output) + assert(output.contains("SUCCESS!"), "Application did not run successfully: \n" + output) +} diff --git a/src/sbt-test/ash/script-debug/project/build.properties b/src/sbt-test/ash/script-debug/project/build.properties new file mode 100644 index 000000000..abbbce5da --- /dev/null +++ b/src/sbt-test/ash/script-debug/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.9.8 diff --git a/src/sbt-test/ash/script-debug/project/plugins.sbt b/src/sbt-test/ash/script-debug/project/plugins.sbt new file mode 100644 index 000000000..218f1a27d --- /dev/null +++ b/src/sbt-test/ash/script-debug/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % sys.props("project.version")) diff --git a/src/sbt-test/ash/script-debug/src/main/scala/MainApp.scala b/src/sbt-test/ash/script-debug/src/main/scala/MainApp.scala new file mode 100644 index 000000000..0325f9cb5 --- /dev/null +++ b/src/sbt-test/ash/script-debug/src/main/scala/MainApp.scala @@ -0,0 +1,3 @@ +object MainApp extends App { + println("SUCCESS!") +} diff --git a/src/sbt-test/ash/script-debug/test b/src/sbt-test/ash/script-debug/test new file mode 100644 index 000000000..b6d62fecd --- /dev/null +++ b/src/sbt-test/ash/script-debug/test @@ -0,0 +1,4 @@ +# Run the staging and check the script. +> stage +$ exists target/universal/stage/bin/script-debug +> runCheck diff --git a/src/sbt-test/ash/script-help/build.sbt b/src/sbt-test/ash/script-help/build.sbt new file mode 100644 index 000000000..0385f5ac8 --- /dev/null +++ b/src/sbt-test/ash/script-help/build.sbt @@ -0,0 +1,26 @@ +enablePlugins(JavaAppPackaging, AshScriptPlugin) + +name := "script-help" + +version := "0.1.0" + +TaskKey[Unit]("runCheck") := { + val cwd = (stagingDirectory in Universal).value + val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath, "-h") + + val buffer = new StringBuffer + val code = sys.process.Process(cmd, cwd).run(scala.sys.process.BasicIO(false, buffer, None)).exitValue() + assert(code == 1, "Exit code for -h was not 1: " + code) + + val output = buffer.toString.replaceAll("\n", "") + + val expectedHelpSamples = Seq( + "-h | -help", "print this message", + "-jvm-debug", + "JAVA_OPTS", + "special option" + ) + + assert(expectedHelpSamples.forall(output contains _), + s"Application did not print the correct help message: \n" + output) +} diff --git a/src/sbt-test/ash/script-help/project/build.properties b/src/sbt-test/ash/script-help/project/build.properties new file mode 100644 index 000000000..abbbce5da --- /dev/null +++ b/src/sbt-test/ash/script-help/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.9.8 diff --git a/src/sbt-test/ash/script-help/project/plugins.sbt b/src/sbt-test/ash/script-help/project/plugins.sbt new file mode 100644 index 000000000..218f1a27d --- /dev/null +++ b/src/sbt-test/ash/script-help/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % sys.props("project.version")) diff --git a/src/sbt-test/ash/script-help/src/main/scala/MainApp.scala b/src/sbt-test/ash/script-help/src/main/scala/MainApp.scala new file mode 100644 index 000000000..0325f9cb5 --- /dev/null +++ b/src/sbt-test/ash/script-help/src/main/scala/MainApp.scala @@ -0,0 +1,3 @@ +object MainApp extends App { + println("SUCCESS!") +} diff --git a/src/sbt-test/ash/script-help/test b/src/sbt-test/ash/script-help/test new file mode 100644 index 000000000..1b5145a7b --- /dev/null +++ b/src/sbt-test/ash/script-help/test @@ -0,0 +1,4 @@ +# Run the staging and check the script. +> stage +$ exists target/universal/stage/bin/script-help +> runCheck diff --git a/src/sbt-test/bash/script-debug/build.sbt b/src/sbt-test/bash/script-debug/build.sbt new file mode 100644 index 000000000..2e2296537 --- /dev/null +++ b/src/sbt-test/bash/script-debug/build.sbt @@ -0,0 +1,17 @@ +import java.net.ServerSocket + +enablePlugins(JavaAppPackaging) + +name := "script-debug" + +version := "0.1.0" + +TaskKey[Unit]("runCheck") := { + val cwd = (stagingDirectory in Universal).value + val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath, "-jvm-debug", "0") + val output = (sys.process.Process(cmd, cwd).!!).replaceAll("\n", "") + + assert(output.contains("Listening for transport dt_socket at address:"), + "Application did not start in debug mode: \n" + output) + assert(output.contains("SUCCESS!"), "Application did not run successfully: \n" + output) +} diff --git a/src/sbt-test/bash/script-debug/project/build.properties b/src/sbt-test/bash/script-debug/project/build.properties new file mode 100644 index 000000000..abbbce5da --- /dev/null +++ b/src/sbt-test/bash/script-debug/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.9.8 diff --git a/src/sbt-test/bash/script-debug/project/plugins.sbt b/src/sbt-test/bash/script-debug/project/plugins.sbt new file mode 100644 index 000000000..218f1a27d --- /dev/null +++ b/src/sbt-test/bash/script-debug/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % sys.props("project.version")) diff --git a/src/sbt-test/bash/script-debug/src/main/scala/MainApp.scala b/src/sbt-test/bash/script-debug/src/main/scala/MainApp.scala new file mode 100644 index 000000000..0325f9cb5 --- /dev/null +++ b/src/sbt-test/bash/script-debug/src/main/scala/MainApp.scala @@ -0,0 +1,3 @@ +object MainApp extends App { + println("SUCCESS!") +} diff --git a/src/sbt-test/bash/script-debug/test b/src/sbt-test/bash/script-debug/test new file mode 100644 index 000000000..b6d62fecd --- /dev/null +++ b/src/sbt-test/bash/script-debug/test @@ -0,0 +1,4 @@ +# Run the staging and check the script. +> stage +$ exists target/universal/stage/bin/script-debug +> runCheck diff --git a/src/sbt-test/bash/script-help/build.sbt b/src/sbt-test/bash/script-help/build.sbt new file mode 100644 index 000000000..641af1ad7 --- /dev/null +++ b/src/sbt-test/bash/script-help/build.sbt @@ -0,0 +1,26 @@ +enablePlugins(JavaAppPackaging) + +name := "script-help" + +version := "0.1.0" + +TaskKey[Unit]("runCheck") := { + val cwd = (stagingDirectory in Universal).value + val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath, "-h") + + val buffer = new StringBuffer + val code = sys.process.Process(cmd, cwd).run(scala.sys.process.BasicIO(false, buffer, None)).exitValue() + assert(code == 1, "Exit code for -h was not 1: " + code) + + val output = buffer.toString.replaceAll("\n", "") + + val expectedHelpSamples = Seq( + "-h | -help", "print this message", + "-jvm-debug", + "JAVA_OPTS", + "special option" + ) + + assert(expectedHelpSamples.forall(output contains _), + s"Application did not print the correct help message: \n" + output) +} diff --git a/src/sbt-test/bash/script-help/project/build.properties b/src/sbt-test/bash/script-help/project/build.properties new file mode 100644 index 000000000..abbbce5da --- /dev/null +++ b/src/sbt-test/bash/script-help/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.9.8 diff --git a/src/sbt-test/bash/script-help/project/plugins.sbt b/src/sbt-test/bash/script-help/project/plugins.sbt new file mode 100644 index 000000000..218f1a27d --- /dev/null +++ b/src/sbt-test/bash/script-help/project/plugins.sbt @@ -0,0 +1 @@ +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % sys.props("project.version")) diff --git a/src/sbt-test/bash/script-help/src/main/scala/MainApp.scala b/src/sbt-test/bash/script-help/src/main/scala/MainApp.scala new file mode 100644 index 000000000..0325f9cb5 --- /dev/null +++ b/src/sbt-test/bash/script-help/src/main/scala/MainApp.scala @@ -0,0 +1,3 @@ +object MainApp extends App { + println("SUCCESS!") +} diff --git a/src/sbt-test/bash/script-help/test b/src/sbt-test/bash/script-help/test new file mode 100644 index 000000000..1b5145a7b --- /dev/null +++ b/src/sbt-test/bash/script-help/test @@ -0,0 +1,4 @@ +# Run the staging and check the script. +> stage +$ exists target/universal/stage/bin/script-help +> runCheck From 32523ea845758a28d3e1dab8a6e87ee5f2dcb196 Mon Sep 17 00:00:00 2001 From: Istvan Gansperger Date: Thu, 22 Aug 2024 18:05:15 +0200 Subject: [PATCH 2/5] Add missing functions to the ash template --- .../packager/archetypes/scripts/ash-template | 50 +++++++++++++++++-- src/sbt-test/ash/script-debug/build.sbt | 2 - src/sbt-test/ash/script-help/build.sbt | 4 +- src/sbt-test/bash/script-help/build.sbt | 4 +- 4 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template index 2b6a693df..a7e00e42d 100644 --- a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template +++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template @@ -1,5 +1,10 @@ #!/bin/sh +die() { + echo "$@" 1>&2 + exit 1 +} + realpath () { ( TARGET_FILE="$1" @@ -51,6 +56,19 @@ addResidual () { residual_args="$residual_args $(shellEscape "$1")" } +addDebugger () { + addJava "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$1" +} + +require_arg () { + local type="$1" + local opt="$2" + local arg="$3" + if [[ -z "$arg" ]] || [[ "${arg:0:1}" == "-" ]]; then + die "$opt requires <$type> argument" + fi +} + # Allow user to specify java options. These get listed first per bash-template. if [ -n "$JAVA_OPTS" ] then @@ -81,10 +99,6 @@ process_args () { case "$1" in --) shift && no_more_snp_opts=1 && break ;; -h|-help) usage; exit 1 ;; - -v|-verbose) verbose=1 && shift ;; - -d|-debug) debug=1 && shift ;; - - -no-version-check) no_version_check=1 && shift ;; -mem) echo "!! WARNING !! -mem option is ignored. Please use -J-Xmx and -J-Xms" && shift 2 ;; -jvm-debug) require_arg port "$1" "$2" && addDebugger $2 && shift 2 ;; @@ -106,6 +120,34 @@ process_args () { fi } +usage() { + cat < Define a custom main class + -jvm-debug Turn on JVM debugging, open at the given port. + + # java version (default: java from PATH, currently $(java -version 2>&1 | grep version)) + -java-home alternate JAVA_HOME + + # jvm options and output control + JAVA_OPTS environment variable, if unset uses "$java_opts" + -Dkey=val pass -Dkey=val directly to the java runtime + -J-X pass option -X directly to the java runtime + (-J is stripped) + + # special option + -- To stop parsing built-in commands from the rest of the command-line. + e.g.) enabling debug and sending -d as app argument + \$ ./start-script -d -- -d + +In the case of duplicated or conflicting options, basically the order above +shows precedence: JAVA_OPTS lowest, command line options highest except "--". +${{available_main_classes}} +EOM +} + app_commands="" residual_args="" real_script_path="$(realpath "$0")" diff --git a/src/sbt-test/ash/script-debug/build.sbt b/src/sbt-test/ash/script-debug/build.sbt index dbb68e1ea..7f93eae2c 100644 --- a/src/sbt-test/ash/script-debug/build.sbt +++ b/src/sbt-test/ash/script-debug/build.sbt @@ -1,5 +1,3 @@ -import java.net.ServerSocket - enablePlugins(JavaAppPackaging, AshScriptPlugin) name := "script-debug" diff --git a/src/sbt-test/ash/script-help/build.sbt b/src/sbt-test/ash/script-help/build.sbt index 0385f5ac8..c38e24f7b 100644 --- a/src/sbt-test/ash/script-help/build.sbt +++ b/src/sbt-test/ash/script-help/build.sbt @@ -5,7 +5,7 @@ name := "script-help" version := "0.1.0" TaskKey[Unit]("runCheck") := { - val cwd = (stagingDirectory in Universal).value + val cwd = (Universal / stagingDirectory).value val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath, "-h") val buffer = new StringBuffer @@ -21,6 +21,6 @@ TaskKey[Unit]("runCheck") := { "special option" ) - assert(expectedHelpSamples.forall(output contains _), + assert(expectedHelpSamples.forall(output.contains(_)), s"Application did not print the correct help message: \n" + output) } diff --git a/src/sbt-test/bash/script-help/build.sbt b/src/sbt-test/bash/script-help/build.sbt index 641af1ad7..44f79e0d3 100644 --- a/src/sbt-test/bash/script-help/build.sbt +++ b/src/sbt-test/bash/script-help/build.sbt @@ -5,7 +5,7 @@ name := "script-help" version := "0.1.0" TaskKey[Unit]("runCheck") := { - val cwd = (stagingDirectory in Universal).value + val cwd = (Universal / stagingDirectory).value val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath, "-h") val buffer = new StringBuffer @@ -21,6 +21,6 @@ TaskKey[Unit]("runCheck") := { "special option" ) - assert(expectedHelpSamples.forall(output contains _), + assert(expectedHelpSamples.forall(output.contains(_)), s"Application did not print the correct help message: \n" + output) } From 20ca24b65bc8af88609983c2eb5933e5c73425c7 Mon Sep 17 00:00:00 2001 From: Istvan Gansperger Date: Thu, 28 Nov 2024 01:14:18 +0100 Subject: [PATCH 3/5] replace bash syntax with ash compatible one --- .../com/typesafe/sbt/packager/archetypes/scripts/ash-template | 4 ++-- src/sbt-test/ash/script-debug/build.sbt | 2 +- src/sbt-test/bash/script-debug/build.sbt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template index a7e00e42d..dbf917b7f 100644 --- a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template +++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/ash-template @@ -64,7 +64,7 @@ require_arg () { local type="$1" local opt="$2" local arg="$3" - if [[ -z "$arg" ]] || [[ "${arg:0:1}" == "-" ]]; then + if [ -z "$arg" ] || [ "${arg#-}" != "$arg" ]; then die "$opt requires <$type> argument" fi } @@ -113,7 +113,7 @@ process_args () { esac done - if [ $no_more_snp_opts ]; then + if [ $no_more_snp_opts -ne 0 ]; then while [ $# -gt 0 ]; do addResidual "$1" && shift done diff --git a/src/sbt-test/ash/script-debug/build.sbt b/src/sbt-test/ash/script-debug/build.sbt index 7f93eae2c..2e8ee604e 100644 --- a/src/sbt-test/ash/script-debug/build.sbt +++ b/src/sbt-test/ash/script-debug/build.sbt @@ -5,7 +5,7 @@ name := "script-debug" version := "0.1.0" TaskKey[Unit]("runCheck") := { - val cwd = (stagingDirectory in Universal).value + val cwd = (Universal / stagingDirectory).value val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath, "-jvm-debug", "0") val output = (sys.process.Process(cmd, cwd).!!).replaceAll("\n", "") diff --git a/src/sbt-test/bash/script-debug/build.sbt b/src/sbt-test/bash/script-debug/build.sbt index 2e2296537..c6e6ee9d9 100644 --- a/src/sbt-test/bash/script-debug/build.sbt +++ b/src/sbt-test/bash/script-debug/build.sbt @@ -7,7 +7,7 @@ name := "script-debug" version := "0.1.0" TaskKey[Unit]("runCheck") := { - val cwd = (stagingDirectory in Universal).value + val cwd = (Universal / stagingDirectory).value val cmd = Seq((cwd / "bin" / packageName.value).getAbsolutePath, "-jvm-debug", "0") val output = (sys.process.Process(cmd, cwd).!!).replaceAll("\n", "") From ee94e4cdd1b9be0dc84260aa94d136ef5674dc77 Mon Sep 17 00:00:00 2001 From: Istvan Gansperger Date: Wed, 22 Jan 2025 13:47:42 +0100 Subject: [PATCH 4/5] Revert "Fixes remote debug connections closing (#1546)" This reverts commit 665e4e245a3d88fa0e567eb3918c808a03bfd88a. --- .../com/typesafe/sbt/packager/archetypes/scripts/bash-template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template index b0f859d86..99520595e 100644 --- a/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template +++ b/src/main/resources/com/typesafe/sbt/packager/archetypes/scripts/bash-template @@ -154,7 +154,7 @@ addResidual () { residual_args+=( "$1" ) } addDebugger () { - addJava "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:$1" + addJava "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=$1" } require_arg () { From f2f293338bd32dd66a2532db58aa8d045ddee39d Mon Sep 17 00:00:00 2001 From: Istvan Gansperger Date: Wed, 22 Jan 2025 15:04:07 +0100 Subject: [PATCH 5/5] fix sbt 2.0 cross-build for new tests --- src/sbt-test/ash/script-debug/project/build.properties | 1 - src/sbt-test/ash/script-debug/test | 2 +- src/sbt-test/ash/script-help/project/build.properties | 1 - src/sbt-test/ash/script-help/test | 2 +- src/sbt-test/bash/script-debug/project/build.properties | 1 - src/sbt-test/bash/script-debug/test | 2 +- src/sbt-test/bash/script-help/project/build.properties | 1 - src/sbt-test/bash/script-help/test | 2 +- 8 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 src/sbt-test/ash/script-debug/project/build.properties delete mode 100644 src/sbt-test/ash/script-help/project/build.properties delete mode 100644 src/sbt-test/bash/script-debug/project/build.properties delete mode 100644 src/sbt-test/bash/script-help/project/build.properties diff --git a/src/sbt-test/ash/script-debug/project/build.properties b/src/sbt-test/ash/script-debug/project/build.properties deleted file mode 100644 index abbbce5da..000000000 --- a/src/sbt-test/ash/script-debug/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.9.8 diff --git a/src/sbt-test/ash/script-debug/test b/src/sbt-test/ash/script-debug/test index b6d62fecd..a9c1028d1 100644 --- a/src/sbt-test/ash/script-debug/test +++ b/src/sbt-test/ash/script-debug/test @@ -1,4 +1,4 @@ # Run the staging and check the script. > stage -$ exists target/universal/stage/bin/script-debug +$ exists target/**/universal/stage/bin/script-debug > runCheck diff --git a/src/sbt-test/ash/script-help/project/build.properties b/src/sbt-test/ash/script-help/project/build.properties deleted file mode 100644 index abbbce5da..000000000 --- a/src/sbt-test/ash/script-help/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.9.8 diff --git a/src/sbt-test/ash/script-help/test b/src/sbt-test/ash/script-help/test index 1b5145a7b..cb36f5a42 100644 --- a/src/sbt-test/ash/script-help/test +++ b/src/sbt-test/ash/script-help/test @@ -1,4 +1,4 @@ # Run the staging and check the script. > stage -$ exists target/universal/stage/bin/script-help +$ exists target/**/universal/stage/bin/script-help > runCheck diff --git a/src/sbt-test/bash/script-debug/project/build.properties b/src/sbt-test/bash/script-debug/project/build.properties deleted file mode 100644 index abbbce5da..000000000 --- a/src/sbt-test/bash/script-debug/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.9.8 diff --git a/src/sbt-test/bash/script-debug/test b/src/sbt-test/bash/script-debug/test index b6d62fecd..a9c1028d1 100644 --- a/src/sbt-test/bash/script-debug/test +++ b/src/sbt-test/bash/script-debug/test @@ -1,4 +1,4 @@ # Run the staging and check the script. > stage -$ exists target/universal/stage/bin/script-debug +$ exists target/**/universal/stage/bin/script-debug > runCheck diff --git a/src/sbt-test/bash/script-help/project/build.properties b/src/sbt-test/bash/script-help/project/build.properties deleted file mode 100644 index abbbce5da..000000000 --- a/src/sbt-test/bash/script-help/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.9.8 diff --git a/src/sbt-test/bash/script-help/test b/src/sbt-test/bash/script-help/test index 1b5145a7b..cb36f5a42 100644 --- a/src/sbt-test/bash/script-help/test +++ b/src/sbt-test/bash/script-help/test @@ -1,4 +1,4 @@ # Run the staging and check the script. > stage -$ exists target/universal/stage/bin/script-help +$ exists target/**/universal/stage/bin/script-help > runCheck