tests: Rewrite the previous commit's sed_i helper

[empserver] / tests / test-common.sh

diff --git a/tests/test-common.sh b/tests/test-common.sh
index 35d716408ae583270c353594eb0c0136c35ddab6..f54ba4521e0b93a965030dff40b79e29e26a8b19 100644 (file)
--- a/tests/test-common.sh
+++ b/tests/test-common.sh
@@ -46,7 +46,7 @@ keep_journal 2
 GODNEWS 0
 running_test_suite 1
 EOF
-    cp `git ls-files "$srcdir"/src/lib/global | uniq | grep '\.config$'` sandbox/share/empire/builtin
+    cp `perl "$srcdir"/src/scripts/ls-sources.pl "$srcdir"/src/lib/global '\.config$'` sandbox/share/empire/builtin
 }
 
 copy_tables()
@@ -58,6 +58,16 @@ copy_tables()
     done
 }
 
+# sed -i isn't portable...
+sed_i()
+{
+    local script="$1"
+    shift
+    for i
+    do sed "$script" "$i" >sandbox/$$ && mv sandbox/$$ "$i"
+    done
+}
+
 customize()
 {
     local key
@@ -66,7 +76,7 @@ customize()
        case $key in
        big-city)
            copy_tables sect
-           sed -i '/"c" .* norm/d;/^#.*"c" .* cana/s/^#/ /' sandbox/etc/empire/sect.config
+           sed_i '/"c" .* norm/d;/^#.*"c" .* cana/s/^#/ /' sandbox/etc/empire/sect.config
            ;;
        esac
     done
@@ -173,7 +183,7 @@ feed_files()
 
 feed_dir()
 {
-    feed_files `git ls-files "$@" | uniq | grep '/[0-9][0-9]-[^/]*$'`
+    feed_files `perl "$srcdir"/src/scripts/ls-sources.pl "$@" '/[0-9][0-9]-[^/]*$'`
 }
 
 begin_test()