Fix Windows version of catalog backup scripts.

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3573 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/win32/cats/delete_catalog_backup.cmd b/bacula/src/win32/cats/delete_catalog_backup.cmd
index 6ff55912ac267f27d63d27cf66d650a7d1631230..f25a676da45e8d437b86fa1809c76dc6640abee6 100644 (file)
--- a/bacula/src/win32/cats/delete_catalog_backup.cmd
+++ b/bacula/src/win32/cats/delete_catalog_backup.cmd
@@ -1,4 +1,4 @@
 rem\r
 rem This script deletes a catalog dump\r
 rem\r
-del /f %WORKING_DIR%/bacula.sql\r
+del /f "@working_dir_cmd@\bacula.sql"\r

diff --git a/bacula/src/win32/cats/make_catalog_backup.cmd b/bacula/src/win32/cats/make_catalog_backup.cmd
index 29cee07d383747620ea0215f511bb21c98da7205..ef0cdea7134c70ccc5c57871945f376c4507f564 100644 (file)
--- a/bacula/src/win32/cats/make_catalog_backup.cmd
+++ b/bacula/src/win32/cats/make_catalog_backup.cmd
@@ -13,7 +13,7 @@ rem
 rem \r
 @echo on\r
 \r
-cd @working_dir@\r
+cd @working_dir_cmd@\r
 del /f bacula.sql 2>nul\r
 \r
 set MYSQLPASSWORD=\r
@@ -24,18 +24,18 @@ if not "%3"=="" set MYSQLPASSWORD=--password=%3
 @echo off\r
 rem \r
 rem   To read back a MySQL database use: \r
-rem      cd @working_dir@\r
-rem      rd /s /q -f @SQL_BINDIR@\..\data\bacula\r
-rem      mysql <bacula.sql\r
+rem      cd @working_dir_cmd@\r
+rem      rd /s /q @SQL_BINDIR@\..\data\bacula\r
+rem      mysql < bacula.sql\r
 rem \r
 rem   To read back a SQLite database use:\r
-rem      cd @working_dir@\r
-rem      rm -f bacula.db\r
-rem      sqlite bacula.db <bacula.sql\r
+rem      cd @working_dir_cmd@\r
+rem      del /f bacula.db\r
+rem      sqlite bacula.db < bacula.sql\r
 rem \r
 rem   To read back a PostgreSQL database use:\r
-rem      cd @working_dir@\r
+rem      cd @working_dir_cmd@\r
 rem      dropdb bacula\r
 rem      createdb bacula\r
-rem      psql bacula <bacula.sql\r
+rem      psql bacula < bacula.sql\r
 rem \r

diff --git a/bacula/src/win32/installer/winbacula.nsi b/bacula/src/win32/installer/winbacula.nsi
index 5a80af1e01116493b742ec694248c326f5092e9f..13d4413536b09a16c5bd369f8e68e265299fe075 100644 (file)
--- a/bacula/src/win32/installer/winbacula.nsi
+++ b/bacula/src/win32/installer/winbacula.nsi
@@ -338,21 +338,21 @@ Function InstallCommonFiles
 
     SetOutPath "$INSTDIR\bin"
 !if "${BUILD_TOOLS}" == "VC8"
-    File "${VC_REDIST_DIR}\msvcm80.dll"
-    File "${VC_REDIST_DIR}\msvcp80.dll"
-    File "${VC_REDIST_DIR}\msvcr80.dll"
-    File "${VC_REDIST_DIR}\Microsoft.VC80.CRT.manifest"
+    File "${VC_REDIST_DIR}\x86\Microsoft.VC80.CRT\msvcm80.dll"
+    File "${VC_REDIST_DIR}\x86\Microsoft.VC80.CRT\msvcp80.dll"
+    File "${VC_REDIST_DIR}\x86\Microsoft.VC80.CRT\msvcr80.dll"
+    File "${VC_REDIST_DIR}\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
     File "${DEPKGS_BIN}\pthreadVCE.dll"
 !endif
 !if "${BUILD_TOOLS}" == "VC8_DEBUG"
-    File "${VC_REDIST_DIR}\msvcm80.dll"
-    File "${VC_REDIST_DIR}\msvcp80.dll"
-    File "${VC_REDIST_DIR}\msvcr80.dll"
-    File "${VC_REDIST_DIR}\Microsoft.VC80.CRT.manifest"
-    File "${VC_REDIST_DIR}\msvcm80d.dll"
-    File "${VC_REDIST_DIR}\msvcp80d.dll"
-    File "${VC_REDIST_DIR}\msvcr80d.dll"
-    File "${VC_REDIST_DIR}\Microsoft.VC80.DebugCRT.manifest"
+    File "${VC_REDIST_DIR}\x86\Microsoft.VC80.CRT\msvcm80.dll"
+    File "${VC_REDIST_DIR}\x86\Microsoft.VC80.CRT\msvcp80.dll"
+    File "${VC_REDIST_DIR}\x86\Microsoft.VC80.CRT\msvcr80.dll"
+    File "${VC_REDIST_DIR}\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"
+    File "${VC_REDIST_DIR}\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcm80d.dll"
+    File "${VC_REDIST_DIR}\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcp80d.dll"
+    File "${VC_REDIST_DIR}\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\msvcr80d.dll"
+    File "${VC_REDIST_DIR}\Debug_NonRedist\x86\Microsoft.VC80.DebugCRT\Microsoft.VC80.DebugCRT.manifest"
     File "${DEPKGS_BIN}\pthreadVCE.dll"
 !endif
 !if "${BUILD_TOOLS}" == "MinGW"
@@ -677,8 +677,17 @@ Section "Director Service" SecDirectorDaemon
     File /oname=update_tables.cmd ${CATS_DIR}\update_bdb_tables.cmd
     File /oname=grant_privileges.cmd ${CATS_DIR}\grant_bdb_privileges.cmd
   ${EndIf}
-  File ${CATS_DIR}\make_catalog_backup.cmd
-  File ${CATS_DIR}\delete_catalog_backup.cmd
+  ${Unless} ${FileExists} "$INSTDIR\bin\make_catalog_backup.cmd"
+    File "/oname=$PLUGINSDIR\make_catalog_backup.cmd" "${CATS_DIR}\make_catalog_backup.cmd"
+    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\make_catalog_backup.cmd"'
+    CopyFiles "$PLUGINSDIR\make_catalog_backup.cmd" "$INSTDIR\bin\make_catalog_backup.cmd"
+  ${EndUnless}
+  ${Unless} ${FileExists} "$INSTDIR\bin\delete_catalog_backup.cmd"
+    File "/oname=$PLUGINSDIR\delete_catalog_backup.cmd" "${CATS_DIR}\delete_catalog_backup.cmd"
+    nsExec::ExecToLog '$PLUGINSDIR\sed.exe -f "$PLUGINSDIR\config.sed" -i.bak "$PLUGINSDIR\delete_catalog_backup.cmd"'
+    CopyFiles "$PLUGINSDIR\delete_catalog_backup.cmd" "$INSTDIR\bin\delete_catalog_backup.cmd"
+  ${EndUnless}
+  File "query.sql"
 
   ${Unless} ${FileExists} "$APPDATA\Bacula\bacula-dir.conf"
     File "/oname=$PLUGINSDIR\bacula-dir.conf.in" "bacula-dir.conf.in"