Simplify merge-cf.data.pre.awk, not relying on command line variable assignments...

diff --git a/scripts/merge-cf.data.pre.awk b/scripts/merge-cf.data.pre.awk
index e09cd092933a14aa9329ac3836adad538da19db9..da52e4623db4264e014ec73b8143d2da52d7f8c2 100755 (executable)
--- a/scripts/merge-cf.data.pre.awk
+++ b/scripts/merge-cf.data.pre.awk
@@ -2,12 +2,14 @@
 # This script reassembles a split configuration file back into a cf.data.pre
 # file.
 
-BEGIN { dir = SRCDIR "conf/"; }
 /^NAME: / {
     tag = $2;
+    dir = FILENAME;
+    gsub(/[^/\\]*$/, "", dir);
     file=dir tag ".txt";
     $0 = "FILE_NOT_FOUND";
-    getline < file;
+    if (!getline < file)
+       $0 = "FILE_NOT_FOUND";
     if (/^FILE_NOT_FOUND/) {
        print "ERROR: '" file "' not found!" > "/dev/stderr";
        exit 1;