Fix problem with regress-config not properly created

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

diff --git a/regress/Makefile b/regress/Makefile
index 7cd8d895a385d0bb10f9bcfbdb0bfc164f260fcf..4523db35b88c541d7c8631829603f70924427a54 100644 (file)
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -28,6 +28,7 @@ bacula: all
        @rm -f w.tar.gz w.tar
        @rm -rf tmp working
        mkdir tmp working
+       scripts/create_sed
        echo "Doing: scripts/setup"
        scripts/setup
 

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index ab5e7ed27d223b3c6d280f4fd6839a02b7b8ac76..3fb34ff9e8ad3059ea65b4a9535f508b942fa2f3 100755 (executable)
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -58,7 +58,7 @@ sed -f ${out} ${cwd}/scripts/bacula-sd-2d.conf.in >${cwd}/scripts/bacula-sd-2d.c
 sed -f ${out} ${cwd}/scripts/bacula-dir-2d.conf.in >${cwd}/scripts/bacula-dir-2d.conf
 sed -f ${out} ${cwd}/scripts/bconsole-2d.conf.in >${cwd}/scripts/bconsole-2d.conf
 sed -f ${out} ${cwd}/scripts/regress-config.in >${cwd}/scripts/regress-config
-
+chmod 755 ${cwd}/scripts/regress-config
 
 scripts/config_dart
 

diff --git a/regress/scripts/regress-config.in b/regress/scripts/regress-config.in
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/regress/scripts/setup b/regress/scripts/setup
index d9dc1533ec150f1ed22549d7b03f6ab9853beca1..4a6e81b2c9c37b7677cd01d9074612d19e7696ad 100755 (executable)
--- a/regress/scripts/setup
+++ b/regress/scripts/setup
@@ -19,10 +19,14 @@ if [ ! -d ${BACULA_SOURCE} ] ; then
    echo " "
    exit 1
 fi
+
 rm -rf build bin
 # Copy new source
 echo "Copying source from ${BACULA_SOURCE}"
 cp -rp ${BACULA_SOURCE} build
+scripts/create_sed
+sed -f tmp/sed_tmp scripts/regress-config.in >scripts/regress-config
+chmod 755 scripts/regress-config
 cp scripts/regress-config build
 cd build
 rm -f Makefile config.cache