From 8a78a4e72e5c0eea39ff4d85927e8ce26a14ebea Mon Sep 17 00:00:00 2001
From: Eric Bollengier <eric@eb.homelinux.org>
Date: Mon, 21 Mar 2011 16:59:32 +0100
Subject: [PATCH] regress: Add fix for ubuntu dash that adds quotes to "set"
 output

---
 regress/scripts/functions.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/regress/scripts/functions.pm b/regress/scripts/functions.pm
index a9774a5af1..0d7d5717a2 100644
--- 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
-- 
2.39.2