diff --git a/harvest/batch-delete.bat b/harvest/batch-delete.bat index bff832c87d285d93056c616521fdd45bf5fb9398..217e6db08cbf4bb482ff39e63778831a37180164 100644 --- a/harvest/batch-delete.bat +++ b/harvest/batch-delete.bat @@ -9,16 +9,16 @@ goto end rem Make sure VUFIND_HOME is set: if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound -rem VUFIND_HOME not set -- try to call vufind.bat to +rem VUFIND_HOME not set -- try to call env.bat to rem fix the problem before we give up completely -if exist %0\..\..\vufind.bat goto usevufindbat -rem If vufind.bat doesn't exist, the user hasn't run the installer yet. -echo ERROR: vufind.bat does not exist -- could not set up environment. +if exist %0\..\..\env.bat goto useenvbat +rem If env.bat doesn't exist, the user hasn't run the installer yet. +echo ERROR: env.bat does not exist -- could not set up environment. echo Please run install.php to correct this problem. goto end -:usevufindbat +:useenvbat cd %0\..\.. -call vufind > nul +call env > nul cd %0\.. if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound echo You need to set the VUFIND_HOME environmental variable before running this script. diff --git a/harvest/batch-import-marc-auth.bat b/harvest/batch-import-marc-auth.bat index a96595d710dbab4a7be6e18a34adb9a12a026b73..d9de642c667584d2a268322fb31ec06f69d542e7 100644 --- a/harvest/batch-import-marc-auth.bat +++ b/harvest/batch-import-marc-auth.bat @@ -9,16 +9,16 @@ goto end rem Make sure VUFIND_HOME is set: if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound -rem VUFIND_HOME not set -- try to call vufind.bat to +rem VUFIND_HOME not set -- try to call env.bat to rem fix the problem before we give up completely -if exist %0\..\..\vufind.bat goto usevufindbat -rem If vufind.bat doesn't exist, the user hasn't run the installer yet. -echo ERROR: vufind.bat does not exist -- could not set up environment. +if exist %0\..\..\env.bat goto useenvbat +rem If env.bat doesn't exist, the user hasn't run the installer yet. +echo ERROR: env.bat does not exist -- could not set up environment. echo Please run install.php to correct this problem. goto end -:usevufindbat +:useenvbat cd %0\..\.. -call vufind > nul +call env > nul cd %0\.. if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound echo You need to set the VUFIND_HOME environmental variable before running this script. diff --git a/harvest/batch-import-marc.bat b/harvest/batch-import-marc.bat index 5a1ff9bc8e82c87b0cdbfdf5ebb5ac60ff501471..852f1b7d3454c909649ea33d85c43a1f9eb1a931 100644 --- a/harvest/batch-import-marc.bat +++ b/harvest/batch-import-marc.bat @@ -9,16 +9,16 @@ goto end rem Make sure VUFIND_HOME is set: if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound -rem VUFIND_HOME not set -- try to call vufind.bat to +rem VUFIND_HOME not set -- try to call env.bat to rem fix the problem before we give up completely -if exist %0\..\..\vufind.bat goto usevufindbat -rem If vufind.bat doesn't exist, the user hasn't run the installer yet. -echo ERROR: vufind.bat does not exist -- could not set up environment. +if exist %0\..\..\env.bat goto useenvbat +rem If env.bat doesn't exist, the user hasn't run the installer yet. +echo ERROR: env.bat does not exist -- could not set up environment. echo Please run install.php to correct this problem. goto end -:usevufindbat +:useenvbat cd %0\..\.. -call vufind > nul +call env > nul cd %0\.. if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound echo You need to set the VUFIND_HOME environmental variable before running this script. diff --git a/harvest/batch-import-xsl.bat b/harvest/batch-import-xsl.bat index b17eed3560fc29abfe5f35b3a040c4a8506063b6..e9ab09e396cf00c6759ba1e93e2cfcb9fb0d36de 100644 --- a/harvest/batch-import-xsl.bat +++ b/harvest/batch-import-xsl.bat @@ -9,16 +9,16 @@ goto end rem Make sure VUFIND_HOME is set: if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound -rem VUFIND_HOME not set -- try to call vufind.bat to +rem VUFIND_HOME not set -- try to call env.bat to rem fix the problem before we give up completely -if exist %0\..\..\vufind.bat goto usevufindbat -rem If vufind.bat doesn't exist, the user hasn't run the installer yet. -echo ERROR: vufind.bat does not exist -- could not set up environment. +if exist %0\..\..\env.bat goto useenvbat +rem If env.bat doesn't exist, the user hasn't run the installer yet. +echo ERROR: env.bat does not exist -- could not set up environment. echo Please run install.php to correct this problem. goto end -:usevufindbat +:useenvbat cd %0\..\.. -call vufind > nul +call env > nul cd %0\.. if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound echo You need to set the VUFIND_HOME environmental variable before running this script. diff --git a/import-marc-auth.bat b/import-marc-auth.bat index 217dce3eda47c1928a8a37df7851f0792e62e434..bcef07eb90b4bc81267465b5dc99d4e0ce3c9c3f 100644 --- a/import-marc-auth.bat +++ b/import-marc-auth.bat @@ -9,15 +9,15 @@ goto end rem Make sure we know where the VuFind home directory lives: if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound -rem VUFIND_HOME not set -- try to call vufind.bat to +rem VUFIND_HOME not set -- try to call env.bat to rem fix the problem before we give up completely -if exist vufind.bat goto usevufindbat -rem If vufind.bat doesn't exist, the user hasn't run the installer yet. -echo ERROR: vufind.bat does not exist -- could not set up environment. -echo Please run install.php to correct this problem. +if exist env.bat goto useenvbat +rem If env.bat doesn't exist, the user hasn't run the installer yet. +echo ERROR: env.bat does not exist -- could not set up environment. +echo Please run "php install.php" to correct this problem. goto end -:usevufindbat -call vufind > nul +:useenvbat +call env > nul if not "!%VUFIND_HOME%!"=="!!" goto vufindhomefound echo You need to set the VUFIND_HOME environmental variable before running this script. goto end