From 070f223de57aa2dc5bff2b2b5def050296ac09ba Mon Sep 17 00:00:00 2001 From: Demian Katz <demian.katz@villanova.edu> Date: Wed, 24 Aug 2016 14:39:05 -0400 Subject: [PATCH] Bug fix: eliminated obsolete vufind.bat references. --- harvest/batch-delete.bat | 12 ++++++------ harvest/batch-import-marc-auth.bat | 12 ++++++------ harvest/batch-import-marc.bat | 12 ++++++------ harvest/batch-import-xsl.bat | 12 ++++++------ import-marc-auth.bat | 14 +++++++------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/harvest/batch-delete.bat b/harvest/batch-delete.bat index bff832c87d2..217e6db08cb 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 a96595d710d..d9de642c667 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 5a1ff9bc8e8..852f1b7d345 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 b17eed3560f..e9ab09e396c 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 217dce3eda4..bcef07eb90b 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 -- GitLab