Merge remote-tracking branch 'origin/new/bug_8268'

diff --git a/rewrite-config.PL b/rewrite-config.PL
index 083b3a8..02715ab 100644 (file)
--- a/rewrite-config.PL
+++ b/rewrite-config.PL
@@ -101,6 +101,7 @@ $prefix = $ENV{'INSTALL_BASE'} || "/usr";
   "__KOHA_GROUP__" => "koha",
   "__ZEBRA_PASS__" => "zebrastripes",
   "__ZEBRA_USER__" => "kohauser",
+  '__BACKUP_DIR__' => "$prefix/var/spool",
   '__INTRANET_CGI_DIR__' => "$prefix/intranet/cgi-bin",
   '__INTRANET_TMPL_DIR__' => "$prefix/intranet/templates",
   '__INTRANET_WWW_DIR__' => "$prefix/intranet/www",

diff --git a/tools/export.pl b/tools/export.pl
index 95b8185..3ef8427 100755 (executable)
--- a/tools/export.pl
+++ b/tools/export.pl
@@ -462,7 +462,8 @@ sub download_backup {
     my $filename  = $args->{filename};
 
     return unless ( $directory && -d $directory );
-    return unless ( $filename =~ m/$extension(\.(gz|bz2|xz))?$/ && not $filename =~ m#|# );
+    return unless ( $filename =~ m/\.$extension(\.(gz|bz2|xz))?$/ );
+    return if ( $filename =~ m#/# );
     $filename = "$directory/$filename";
     return unless ( -f $filename && -r $filename );
     return unless ( open(my $dump, '<', $filename) );