ebl Checks if $HOME exists for default location of .brestore.conf

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

diff --git a/gui/brestore/ReleaseNotes b/gui/brestore/ReleaseNotes
index 892442079258a067c3cabfd6338e1eda40dd55d4..723a1ebc478ba7d1ec46d6337b9424c9bf6ba0bb 100644 (file)
--- a/gui/brestore/ReleaseNotes
+++ b/gui/brestore/ReleaseNotes
@@ -1,5 +1,8 @@
           Release Notes for brestore 2.2.0
 
+Version 2.2.5-1:
+ - Fix warning, thanks to Tuomas Jormola
+
 Version 2.2.0-2:
  - cleanup brestore
  - update brestore_xxx only when job is in (T, f, A)

diff --git a/gui/brestore/brestore.pl b/gui/brestore/brestore.pl
index edb27f128b2c55157735c4ad49bfe5be7fa90e2a..fb6178ceef2ede9b0e73e8980e87a3015bca8f1a 100755 (executable)
--- a/gui/brestore/brestore.pl
+++ b/gui/brestore/brestore.pl
@@ -3275,7 +3275,7 @@ sub HELP_MESSAGE
     exit 1;
 }
 
-my $file_conf = "$ENV{HOME}/.brestore.conf" ;
+my $file_conf = (exists $ENV{HOME})? "$ENV{HOME}/.brestore.conf" : undef ;
 my $batch_mod;
 
 GetOptions("conf=s"   => \$file_conf,
@@ -3283,6 +3283,11 @@ GetOptions("conf=s"   => \$file_conf,
           "debug"    => \$debug,
           "help"     => \&HELP_MESSAGE) ;
 
+if (! defined $file_conf) {
+    print STDERR "Could not detect default config and no config file specified\n";
+    HELP_MESSAGE();
+}
+
 my $p = new Pref($file_conf);
 
 if (! -f $file_conf) {