Tweak get_os

[bacula/bacula] / regress / scripts / do_sed

diff --git a/regress/scripts/do_sed b/regress/scripts/do_sed
index 31368c720fa7ac3e30e4b1eb8ca4ae27c6972da5..851dfa73c466c9dcf593c4d1770465b9be787091 100755 (executable)
--- a/regress/scripts/do_sed
+++ b/regress/scripts/do_sed
@@ -5,43 +5,11 @@ cwd=`pwd`
 mkdir -p ${cwd}/bin
 out="${cwd}/tmp/sed_tmp"
 
-# set the ports used by these tests
-dirport=${BASEPORT}
-fdport=`expr ${BASEPORT} '+' 1`
-sdport=`expr ${BASEPORT} '+' 2`
-
-# Create sed command script
-echo "s%@sbindir@%${cwd}/bin%g" >${out}
-echo "s%@scriptdir@%${cwd}/bin%g" >>${out}
-echo "s%@working_dir@%${cwd}/working%g" >>${out}
-echo "s%@piddir@%${cwd}/working%g" >>${out}
-echo "s%@subsysdir@%${cwd}/working%g" >>${out}
-echo "s%@job_email@%${EMAIL}%g" >>${out}
-echo "s%@tape_drive@%${TAPE_DRIVE}%g" >>${out}
-echo "s%@autochanger@%${AUTOCHANGER}%g" >>${out}
-echo "s%@tmpdir@%${cwd}/tmp%g" >>${out}
-echo "s%@hostname@%${HOST}%g" >>${out}
-echo "s%@changer_path@%${AUTOCHANGER_PATH}%g" >>${out}
-echo "s%@tape_drive1@%${TAPE_DRIVE1}%g" >>${out}
-echo "s%@smtp_host@%${SMTP_HOST}%g" >>${out}
-echo "s%@disk_drive@%${cwd}/tmp/disk-changer%g" >>${out}
-echo "s%@hostname@%${hostname}%g" >>${out}
-echo "s%@hostname1@%${hostname1}%g" >>${out}
-echo "s%@hostname2@%${hostname2}%g" >>${out}
-echo "s%@hostname3@%${hostname3}%g" >>${out}
-echo "s%@hostname1_files@%${hostname1_files}%g" >>${out}
-echo "s%@hostname_files@%${hostname_files}%g" >>${out}
-echo "s%@hostname2_files@%${hostname2_files}%g" >>${out}
-echo "s%@hostname3_files@%${hostname3_files}%g" >>${out}
-echo "s%@hostname1_password@%${hostname1_password}%g" >>${out}
-echo "s%@hostname2_password@%${hostname2_password}%g" >>${out}
-echo "s%@hostname3_password@%${hostname3_password}%g" >>${out}
-echo "s%@dirport@%${dirport}%g" >>${out}
-echo "s%@sdport@%${sdport}%g" >>${out}
-echo "s%@fdport@%${fdport}%g" >>${out}
+scripts/create_sed
 
 # process .in files with sed script
 sed -f ${out} ${cwd}/scripts/bacula-dir.conf.errors.in >${cwd}/scripts/bacula-dir.conf.errors
+sed -f ${out} ${cwd}/scripts/bacula-dir.conf.accurate.in >${cwd}/scripts/bacula-dir.conf.accurate
 sed -f ${out} ${cwd}/scripts/test-bacula-dir.conf.in >${cwd}/scripts/test-bacula-dir.conf
 sed -f ${out} ${cwd}/scripts/multi-client-bacula-dir.conf.in >${cwd}/scripts/multi-client-bacula-dir.conf
 sed -f ${out} ${cwd}/scripts/bacula-dir.conf.regexwhere.in >${cwd}/scripts/bacula-dir.conf.regexwhere
@@ -75,11 +43,18 @@ sed -f ${out} ${cwd}/scripts/tls-bacula-fd.conf.in >${cwd}/scripts/tls-bacula-fd
 sed -f ${out} ${cwd}/scripts/tls-bacula-sd.conf.in >${cwd}/scripts/tls-bacula-sd.conf
 sed -f ${out} ${cwd}/scripts/tls-bacula-dir.conf.in >${cwd}/scripts/tls-bacula-dir.conf
 
+sed -f ${out} ${cwd}/scripts/tls-auth-bacula-fd.conf.in >${cwd}/scripts/tls-auth-bacula-fd.conf
+sed -f ${out} ${cwd}/scripts/tls-auth-bacula-sd.conf.in >${cwd}/scripts/tls-auth-bacula-sd.conf
+sed -f ${out} ${cwd}/scripts/tls-auth-bacula-dir.conf.in >${cwd}/scripts/tls-auth-bacula-dir.conf
+
+
 sed -f ${out} ${cwd}/scripts/bacula-fd-2d.conf.in >${cwd}/scripts/bacula-fd-2d.conf
 sed -f ${out} ${cwd}/scripts/bacula-sd-2d.conf.in >${cwd}/scripts/bacula-sd-2d.conf
 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
 
+scripts/config_dart
+
 # These files have no fancy sed stuff, so we just copy them over
 cp scripts/win32-bacula-sd-tape.conf.in scripts/win32-bacula-sd-tape.conf
 cp scripts/win32-bacula-fd.conf.in      scripts/win32-bacula-fd.conf