Skip to content
Snippets Groups Projects
Commit 53eb0fa9 authored by Demian Katz's avatar Demian Katz Committed by Robert Lange
Browse files

Switch back from parentheses to quotes to better handle paths with spaces.

parent f222262b
No related merge requests found
......@@ -60,7 +60,7 @@ set EXTRA_SOLRMARC_SETTINGS=%EXTRA_SOLRMARC_SETTINGS% -Dsolr.core.name=%SOLRCOR
rem ##################################################
rem # Set VUFIND_HOME
rem ##################################################
if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
rem VUFIND_HOME not set -- try to call env.bat to
rem fix the problem before we give up completely
if exist env.bat goto useenvbat
......@@ -73,7 +73,7 @@ set VUFIND_HOME=%VUFIND_HOME:~0,-1%
goto vufindhomefound
:useenvbat
call env > nul
if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
echo You need to set the VUFIND_HOME environmental variable before running this script.
goto end
:vufindhomefound
......@@ -81,11 +81,11 @@ goto end
rem #####################################################
rem # Build java command
rem #####################################################
if not (!%JAVA_HOME%!)==(!!) goto javahomefound
if not "!%JAVA_HOME%!"=="!!" goto javahomefound
set JAVA=java
goto javaset
:javahomefound
set JAVA=%JAVA_HOME%\bin\java
set JAVA="%JAVA_HOME%\bin\java"
:javaset
rem ##################################################
......
......@@ -12,7 +12,7 @@ goto end
rem ##################################################
rem # Set SOLR_HOME
rem ##################################################
if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
rem VUFIND_HOME not set -- try to call env.bat to
rem fix the problem before we give up completely
if exist env.bat goto useenvbat
......@@ -25,22 +25,22 @@ set VUFIND_HOME=%VUFIND_HOME:~0,-1%
goto vufindhomefound
:useenvbat
call env > nul
if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
echo You need to set the VUFIND_HOME environmental variable before running this script.
goto end
:vufindhomefound
if not (!%SOLR_HOME%!)==(!!) goto solrhomefound
if not "!%SOLR_HOME%!"=="!!" goto solrhomefound
set SOLR_HOME=%VUFIND_HOME%\solr\vufind
:solrhomefound
rem #####################################################
rem # Build java command
rem #####################################################
if not (!%JAVA_HOME%!)==(!!) goto javahomefound
if not "!%JAVA_HOME%!"=="!!" goto javahomefound
set JAVA=java
goto javaset
:javahomefound
set JAVA=%JAVA_HOME%\bin\java
set JAVA="%JAVA_HOME%\bin\java"
:javaset
cd %VUFIND_HOME%\import
......
......@@ -40,8 +40,8 @@ rem Unrecognized action -- display help text
if "!%1!"=="!!" goto usage
rem Set VUFIND_HOME (if not already set)
if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
rem VUFIND_HOME not set -- try to call env.bat to
if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
rem VUFIND_HOME not set -- try to call env.bat to
rem fix the problem before we give up completely
if exist env.bat goto useenvbat
rem If env.bat doesn't exist, the user hasn't run the installer yet.
......@@ -53,7 +53,7 @@ set VUFIND_HOME=%VUFIND_HOME:~0,-1%
goto vufindhomefound
:useenvbat
call env > nul
if not (!%VUFIND_HOME%!)==(!!) goto vufindhomefound
if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound
echo You need to set the VUFIND_HOME environmental variable before running this script.
goto end
:vufindhomefound
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment