close torakiki#335: launch scripts should check PDFSAM_JAVA_PATH exis…

…tence, not just if it's defined
bstaab · Jan 1, 2019 · 0d883bc · 0d883bc
1 parent 7cb5e06
commit 0d883bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pdfsam-basic/src/assembly/resources/bin/pdfsam.bat b/pdfsam-basic/src/assembly/resources/bin/pdfsam.bat
@@ -64,7 +64,7 @@ for %%i in ("%~dp0..") do set "BASEDIR=%%~fi"
 :repoSetup
 set "RUNTIME=%BASEDIR%\runtime"
 
-if DEFINED PDFSAM_JAVA_PATH (
+if exist "%PDFSAM_JAVA_PATH%" (
 	set "JAVACMD=%PDFSAM_JAVA_PATH%\bin\java"
 ) else (
 	if exist "%RUNTIME%" (

diff --git a/pdfsam-basic/src/assembly/resources/bin/pdfsam.sh b/pdfsam-basic/src/assembly/resources/bin/pdfsam.sh
@@ -33,7 +33,7 @@ PRGDIR=`dirname "$PRG"`
 BASEDIR=`cd "$PRGDIR/.." >/dev/null; pwd`
 RUNTIME="$BASEDIR"/runtime
 
-if [ -z "$PDFSAM_JAVA_PATH" ]; then
+if [ ! -d "$PDFSAM_JAVA_PATH" ]; then
   	# the rutime is supplied
 	if [ -d "$RUNTIME" ]; then
 	  JAVA_HOME="$RUNTIME"