From: Kern Sibbald <kern@sibbald.com>
Date: Thu, 11 Aug 2005 10:49:50 +0000 (+0000)
Subject: - Modified bconsole script so that it is improperly
X-Git-Tag: Release-1.38.0~201
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=95258e0b6c032388b013c6300a773b031fc156a2;p=bacula%2Fbacula

- Modified bconsole script so that it is improperly
  installed, it will refuse to execute.  This avoids
  recursive call loops.


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

diff --git a/bacula/ReleaseNotes b/bacula/ReleaseNotes
index e9fdca9c10..4954bdfc29 100644
--- a/bacula/ReleaseNotes
+++ b/bacula/ReleaseNotes
@@ -1,5 +1,5 @@
 
-          Release Notes for Bacula 1.37.32
+          Release Notes for Bacula 1.37.35
 
   Bacula code: Total files = 420 Total lines = 137,098 (*.h *.c *.in)
 
@@ -52,6 +52,8 @@ Major Changes:
 - Web-bacula, previously a separate project by Juan Luis Frances,
   is now included in the Bacula GUI release (yet to be fully
   created).
+- The code is now Internationalized so that it can be localized
+  in native languages.  Thanks to Nicolas Boichat.
 
 New Directives:
 - New Job directive "Prefer Mounted Volumes = yes|no" causes the
diff --git a/bacula/kes-1.37 b/bacula/kes-1.37
index ecf137b258..fbbfc0e5b9 100644
--- a/bacula/kes-1.37
+++ b/bacula/kes-1.37
@@ -3,6 +3,11 @@
 
 General:
 
+Changes to 1.37.35:
+11Aug05
+- Modified bconsole script so that it is improperly
+  installed, it will refuse to execute.  This avoids
+  recursive call loops.
 Changes to 1.37.34:
 06Aug05
 - Apply David's ACL fix to src/filed/acl.c
diff --git a/bacula/scripts/bconsole.in b/bacula/scripts/bconsole.in
index 2aa66b00b2..25ed4e9053 100755
--- a/bacula/scripts/bconsole.in
+++ b/bacula/scripts/bconsole.in
@@ -1,4 +1,20 @@
 #!/bin/sh
+which dirname >/dev/null 
+# does dirname exit?
+if [ $? = 0 ] ; then
+  cwd=`dirname $0`
+  if [ x$cwd = x. ]; then
+     cwd=`pwd`
+  fi
+  if [ x$cwd = x@sbindir@ ] ; then
+     echo "bconsole not properly installed."  
+     exit 1
+  fi
+fi
+if [ x@sbindir@ = x@sysconfdir@ ]; then
+   echo "bconsole not properly installed."
+   exit 1
+fi
 if [ $# = 1 ] ; then
    echo "doing bconsole $1.conf"
    @sbindir@/bconsole -c $1.conf
diff --git a/bacula/src/version.h b/bacula/src/version.h
index 062cd9d19d..6e47d909fa 100644
--- a/bacula/src/version.h
+++ b/bacula/src/version.h
@@ -1,8 +1,8 @@
 /* */
 #undef  VERSION
-#define VERSION "1.37.34"
-#define BDATE   "06 August 2005"
-#define LSMDATE "06Aug05"
+#define VERSION "1.37.35"
+#define BDATE   "11 August 2005"
+#define LSMDATE "11Aug05"
 
 /* Debug flags */
 #undef  DEBUG