From: Rob Browning <rlb@defaultvalue.org>
Date: Sat, 11 Apr 2015 17:10:38 +0000 (-0500)
Subject: configure-sampledata: remove vestigial etc too
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=dfaee0f02a15a4fa51b86d50b4fce7db7c0b3e0a;p=packages%2Fb%2Fbup.git

configure-sampledata: remove vestigial etc too

Thanks to Mark J Hewitt for reporting the problem.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>
---

diff --git a/t/configure-sampledata b/t/configure-sampledata
index 1603fd8..e23a308 100755
--- a/t/configure-sampledata
+++ b/t/configure-sampledata
@@ -19,17 +19,20 @@ if test "$#" -ne 1; then
     usage 1>&2; exit 1
 fi
 
+rm_symlinks()
+{
+    for p in "$@"; do
+        # test -e is false for dangling symlinks.
+        if test -h "$p" -o -e "$p"; then rm "$p" || exit $?; fi
+    done
+}
+
 clean()
 (
     cd t/sampledata || exit $?
     if test -e var; then rm -r var || exit $?; fi
     # Remove legacy content (before everything moved to var/).
-    # test -e is false for dangling symlinks.
-    if test -h b -o -e b; then rm b || exit $?; fi
-    if test -h c -o -e c; then rm c || exit $?; fi
-    if test -h abs-symlink -o -e abs-symlink; then
-        rm abs-symlink || exit $?
-    fi
+    rm_symlinks abs-symlink b c etc
 )
 
 case "$1" in