JAL-3830 Powershell wrapper now works cross-platform. Who needs bash?!

diff --git a/utils/getdown/jalviewc.ps1 b/utils/getdown/jalviewc.ps1
index 300bd9e..44746b1 100755 (executable)
--- a/utils/getdown/jalviewc.ps1
+++ b/utils/getdown/jalviewc.ps1
@@ -1,30 +1,34 @@
 #!/usr/bin/env pwsh
 
-# save first parameter
+# save args and first parameter
 $ARGS = $args
 $ARG1 = $args[0]
 # parent dir of this script (should be the getdown app dir)
 $DIR = Split-Path $MyInvocation.MyCommand.Path -Parent
 
 # insert an "-open" parameter to Jalview's ARGS if ARG1 is non-zero-length, and not "open" or starts with a "-"
-if ( $ARG1.length -gt 0 -and (-not $ARG1.StartsWith("-")) -and $ARG1 -ne "open" ) {
+if ( $ARG1.length -gt 0 -and ( -not $ARG1.StartsWith("-") ) -and $ARG1 -cne "open" ) {
   $ARGS = "-open " + $ARGS
 }
 
 $APPDIR = $DIR
-$JAVA = "${APPDIR}\jre\bin\java.exe"
-$GETDOWNTXT = "${APPDIR}\getdown.txt"
+$JAVAEXE = ( $IsWindows ? "java.exe" : "java" )
+$JAVA = Join-Path -Path $APPDIR -ChildPath ( "jre/" + ( $IsMacOs ? "Contents/Home/" : "" ) + "bin/${JAVAEXE}" )
+$GETDOWNTXT = Join-Path -Path $APPDIR -ChildPath "getdown.txt"
 
-if (-not (Test-Path -Path "${GETDOWNTXT}")) {
+Write-Host "JAVA=$JAVA"
+# look for getdown.txt -- needed to create classpath
+if ( -not ( Test-Path -Path "${GETDOWNTXT}" ) ) {
   throw "Cannot find getdown.txt"
 }
 
-if (-not (Test-Path -Path "${JAVA}")) {
-  Write-Host "Cannot find bundled java.exe. Using system and hoping for the best!"
-  $JAVA = "java.exe"
+# look for bundled JRE. Might not be there if unix installer used in which case just invoke "java"
+if ( -not ( Test-Path -Path "${JAVA}" ) ) {
+  Write-Host "Cannot find bundled ${JAVAEXE}. Using system ${JAVAEXE} and hoping for the best!"
+  $JAVA = $JAVAEXE
 }
 
-$CLASSPATH = (Select-String -Path "${GETDOWNTXT}" -AllMatches -Pattern "code\s*=\s*(.*)$" | foreach { "$DIR\$($_.Matches.Groups[1].Value -replace "/", "\")" }) -join ";"
+$CLASSPATH = ( Select-String -Path "${GETDOWNTXT}" -AllMatches -Pattern "code\s*=\s*(.*)$" | foreach { Join-Path -Path $DIR -ChildPath $($_.Matches.Groups[1].Value ) } ) -join ( $IsWindows ? ";" : ":" )
 
 Invoke-Expression -Command "${JAVA} -cp '${CLASSPATH}' jalview.bin.Launcher $ARGS"