From 12db1feb53f606f4d6f2a5107ea911b7ff548070 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Mon, 2 Mar 2020 12:06:24 +0200
Subject: [PATCH] fixes to docker-test - progress

---
 scripts/debian-packaging/docker-test.pl | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/debian-packaging/docker-test.pl b/scripts/debian-packaging/docker-test.pl
index 6680b0f..5aeed41 100644
--- a/scripts/debian-packaging/docker-test.pl
+++ b/scripts/debian-packaging/docker-test.pl
@@ -49,10 +49,11 @@ chdir $cwd;
 
 my $LOG_FN = "git-buildpackage-log.txt";
 
+my $BASH_SAFETY = "set -e -x ; set -o pipefail ; ";
+
 # do_system( { cmd => [ 'docker', 'cp', "../scripts", "fcsfed:scripts", ] } );
 my $script = <<"EOSCRIPTTTTTTT";
-set -e -x
-set -o pipefail
+$BASH_SAFETY
 apt-get -y update
 apt-get -y install eatmydata sudo
 sudo eatmydata apt -y install build-essential cmake git-buildpackage perl
@@ -70,13 +71,14 @@ do_system(
     {
         cmd => [
             'docker', 'exec', $CONTAINER, 'bash', '-c',
-            "set -e -x; chown -R $USER:$USER $HOMEDIR",
+            "$BASH_SAFETY chown -R $USER:$USER $HOMEDIR",
         ]
     }
 );
 
 $script = <<"EOSCRIPTTTTTTT";
-cd "$REPO"
+$BASH_SAFETY
+cd "$HOMEDIR/$REPO"
 git clean -dxf .
 gbp buildpackage 2>&1 | tee ~/"$LOG_FN"
 EOSCRIPTTTTTTT
-- 
2.40.0