regress: Add fix for ubuntu dash that adds quotes to "set" output

diff --git a/regress/scripts/functions.pm b/regress/scripts/functions.pm
index a9774a5af1a277065aac5e538e049517e76f8a9a..0d7d5717a2f240be89fb777df284b5d9d5d6f26d 100644 (file)
--- a/regress/scripts/functions.pm
+++ b/regress/scripts/functions.pm
@@ -73,7 +73,7 @@ BEGIN {
     open(IN, ". ./config; set |") or die "Could not run shell: $!\n";
     while ( my $l = <IN> ) {
         chomp ($l);
-        if ($l =~ /^([\w\d]+)=(.+)/) {
+        if ($l =~ /^([\w\d]+)='?([^']+)'?/) {
             next if ($1 eq 'SHELLOPTS'); # is in read-only
             ($envar,$enval) = ($1, $2);
             $ENV{$envar} = $enval;
@@ -571,7 +571,7 @@ sub debug
 sub remote_config
 {
     open(FP, ">$REMOTE_FILE/bacula-fd.conf") or 
-        die "ERROR: Can't open $REMOTE_FILE/bacula-fd.conf $?";
+        die "ERROR: Can't open $REMOTE_FILE/bacula-fd.conf $!";
     print FP "
 Director {
   Name = $HOST-dir