Skip to content

Commit

Permalink
Switch back from parentheses to quotes to better handle paths with sp…
Browse files Browse the repository at this point in the history
…aces.
  • Loading branch information
demiankatz committed Mar 16, 2020
1 parent ff3109a commit f315519
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions import-marc.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -73,19 +73,19 @@ 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

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 ##################################################
Expand Down
10 changes: 5 additions & 5 deletions index-alphabetic-browse.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions solr.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down

0 comments on commit f315519

Please sign in to comment.