[Bash-completion-commits] [SCM] bash-completion branch, master, updated. 360b3dbe196294fd488bfe1b833175ba8febfdd3

Ville Skyttä ville.skytta at iki.fi
Sun Jan 3 13:56:50 UTC 2010


The following commit has been merged in the master branch:
commit ec3227366aa5b2c42830beb61d9c63427ba4cc6f
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Sun Jan 3 15:42:32 2010 +0200

    (testsuite) Make diff_env() compatible with Solaris sed.
    
    It appears to tolerate comments only at beginning of line.

diff --git a/test/lib/library.sh b/test/lib/library.sh
index 476cea3..f995d5b 100644
--- a/test/lib/library.sh
+++ b/test/lib/library.sh
@@ -15,12 +15,16 @@ add_comp_wordbreak_char() {
 # @param $2  File 2
 # @param $3  Additional sed script
 diff_env() {
-	diff "$1" "$2" | sed -e "
-	/^[0-9,]\{1,\}[acd]/d  # Remove diff line indicators
-	/---/d                 # Remove diff block separators
-	/[<>] _=/d             # Remove underscore variable
-	/[<>] PPID=/d          # Remove PPID bash variable
-	$3"
+    diff "$1" "$2" | sed -e "
+# Remove diff line indicators
+        /^[0-9,]\{1,\}[acd]/d
+# Remove diff block separators
+        /---/d
+# Remove underscore variable
+        /[<>] _=/d
+# Remove PPID bash variable
+        /[<>] PPID=/d
+        $3"
 } # diff_env()
 
 

-- 
bash-completion



More information about the Bash-completion-commits mailing list