fix: Some regressions for Windows (quarkusio#1121)

* fix: Make sure jbang bash script can update on Windows

Now that we no longer delegate to the jbang .cmd file when
running inside a Bash shell on Windows the bash script needs
to be able to perform the Windows update procedure.

* fix: `jbang edit` using wrong paths on Windows

Another regression now that we no longer delegate to CMD when using
a bash environment on Windows.

Author: quintesse

src/main/java/dev/jbang/cli/Edit.java

@@ -2,7 +2,6 @@
 
 import static dev.jbang.Settings.CP_SEPARATOR;
 import static dev.jbang.cli.BaseBuildCommand.escapeOSArguments;
-import static dev.jbang.util.Util.isWindows;
 import static dev.jbang.util.Util.verboseMsg;
 import static java.lang.System.out;
 
@@ -36,6 +35,7 @@
 import dev.jbang.util.ConsoleInput;
 import dev.jbang.util.TemplateEngine;
 import dev.jbang.util.Util;
+import dev.jbang.util.Util.Shell;
 
 import io.quarkus.qute.Template;
 import picocli.CommandLine;
@@ -78,6 +78,7 @@ public Integer doCall() throws IOException {
 
 		ScriptSource ssrc = (ScriptSource) src;
 		File project = createProjectForEdit(ssrc, ctx, false);
+		String projectPathString = Util.pathToString(project.getAbsoluteFile().toPath());
 		// err.println(project.getAbsolutePath());
 
 		if (!noOpen) {
@@ -90,22 +91,22 @@ public Integer doCall() throws IOException {
 			} else {
 				List<String> optionList = new ArrayList<>();
 				optionList.add(getEditorToUse().get());
-				optionList.add(project.getAbsolutePath());
+				optionList.add(projectPathString);
 
 				String[] cmd;
 				final String editorCommand = String.join(" ", escapeOSArguments(optionList));
-				if (isWindows()) {
-					cmd = new String[] { "cmd", "/c", editorCommand };
-				} else {
+				if (Util.getShell() == Shell.bash) {
 					cmd = new String[] { "sh", "-c", editorCommand };
+				} else {
+					cmd = new String[] { "cmd", "/c", editorCommand };
 				}
 				info("Running `" + String.join(" ", cmd) + "`");
 				new ProcessBuilder(cmd).start();
 			}
 		}
 
 		if (!live) {
-			out.println(project.getAbsolutePath()); // quit(project.getAbsolutePath());
+			out.println(projectPathString); // quit(project.getAbsolutePath());
 		} else {
 			try (final WatchService watchService = FileSystems.getDefault().newWatchService()) {
 				File orginalFile = src.getResourceRef().getFile();

src/main/java/dev/jbang/cli/Jdk.java

@@ -82,29 +82,36 @@ public Integer javaEnv(
 		Path home = getJdkPath(version);
 		if (home != null) {
 			String homeStr = Util.pathToString(home);
+			String homeOsStr = Util.pathToOsString(home);
 			PrintStream out = System.out;
 			switch (Util.getShell()) {
 			case bash:
-				out.println("export PATH=\"" + homeStr + "/bin:$PATH\"");
-				out.println("export JAVA_HOME=\"" + homeStr + "\"");
-				out.println("# Run this command to configure your shell:");
+				// Not using `println()` here because it will output /n/r
+				// on Windows which causes problems
+				out.print("export PATH=\"" + homeStr + "/bin:$PATH\"\n");
+				out.print("export JAVA_HOME=\"" + homeOsStr + "\"\n");
+				out.print("# Run this command to configure your shell:\n");
 				out.print("# eval $(jbang jdk java-env");
 				if (version != null) {
 					out.print(" " + version);
 				}
-				out.println(")");
+				out.print(")\n");
 				break;
 			case cmd:
 				out.println("set PATH=" + homeStr + "\\bin;%PATH%");
-				out.println("set JAVA_HOME=" + homeStr);
+				out.println("set JAVA_HOME=" + homeOsStr);
 				out.println("rem Copy & paste the above commands in your CMD window or add");
 				out.println("rem them to your Environment Variables in the System Settings.");
 				break;
 			case powershell:
 				out.println("$env:PATH=\"" + homeStr + "\\bin:$env:PATH\"");
-				out.println("$env:JAVA_HOME=\"" + homeStr + "\"");
-				out.println("# Copy & paste the above commands in your Powershell window or add");
-				out.println("# them to your Environment Variables in the System Settings.");
+				out.println("$env:JAVA_HOME=\"" + homeOsStr + "\"");
+				out.println("# Run this command to configure your environment:");
+				out.print("# jbang jdk java-env");
+				if (version != null) {
+					out.print(" " + version);
+				}
+				out.println(" | iex");
 				break;
 			}
 		}

src/main/java/dev/jbang/util/Util.java

@@ -1160,10 +1160,10 @@ private static boolean isExecutable(Path file) {
 	}
 
 	/**
-	 * Converts a Path to a String. This is normally a trivial operation, but in
-	 * certain circumstances, like for example when we need to write a bash shell
-	 * scripts when running inside a Cygwin bash on Windows, we need to do a bit
-	 * more.
+	 * Converts a Path to a String. This is normally a trivial operation, but this
+	 * method handles the special case when running in a Bash shell on Windows,
+	 * where paths have a special format that Java doesn't know about (eg.
+	 * C:\Directory\File.txt becomes /c/Directory/File.txt).
 	 *
 	 * @param path the Path to convert
 	 * @return a String representing the given Path
@@ -1192,6 +1192,24 @@ public static String pathToString(Path path) {
 		}
 	}
 
+	/**
+	 * Converts a Path to a String. This is normally a trivial operation, but this
+	 * method handles the special case when running in a Bash shell on Windows,
+	 * where the default output format would cause problems because the backslashes
+	 * would be interpreted as escape sequences. So we need to escape the
+	 * backslashes.
+	 *
+	 * @param path the Path to convert
+	 * @return a String representing the given Path
+	 */
+	public static String pathToOsString(Path path) {
+		if (isWindows() && getShell() == Shell.bash) {
+			return path.toString().replace("\\", "\\\\");
+		} else {
+			return path.toString();
+		}
+	}
+
 	/**
 	 * Determines if the current JBang we're running was one installed using `app
 	 * install` or not

src/main/scripts/jbang

@@ -117,6 +117,10 @@ else
   $JBDIR/bin/jbang "$@"
   exit $?
 fi
+if [ -f "$jarPath.new" ]; then
+  # a new jbang version was found, we replace the old one with it
+  mv "$jarPath.new" "$jarPath"
+fi
 
 # Find/get a JDK
 unset JAVA_EXEC