From 588f00357effa26b731e90dd129954da4b877901 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@suse.de>
Date: Wed, 14 Jul 2004 13:39:35 +0000
Subject: - Replace a few instances of awk and sed with @AWK@ and @SED@ in  
 *.in files.

---
 bin/quilt.in        | 2 +-
 po/de.po            | 8 +++++---
 quilt/diff.in       | 2 +-
 quilt/grep.in       | 2 +-
 quilt/refresh.in    | 2 +-
 quilt/setup.in      | 2 +-
 quilt/snapshot.in   | 2 +-
 scripts/apatch.in   | 2 +-
 scripts/patchfns.in | 4 ++--
 9 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/bin/quilt.in b/bin/quilt.in
index 3df4bb9..2e31b93 100644
--- a/bin/quilt.in
+++ b/bin/quilt.in
@@ -23,7 +23,7 @@ usage()
 	quilt_commands \
 	| sort \
 	| column | column -t \
-	| sed -e $'s/^/\t/'
+	| @SED@ -e $'s/^/\t/'
 	echo $"
 Common options to all commands:
 
diff --git a/po/de.po b/po/de.po
index 6e05ce6..b7ff04d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -282,10 +282,11 @@ msgid "Usage: quilt edit file ...\\n"
 msgstr "Verwendung: quilt edit datei ...\\n"
 
 #: ../quilt/edit.in:16
+#, fuzzy
 msgid ""
 "\n"
-"Edit the specified file(s) in $EDITOR after adding it (them) to the\n"
-"topmost patch.\n"
+"Edit the specified file(s) in \\$EDITOR (%s) after adding it (them) to\n"
+"the topmost patch.\n"
 msgstr ""
 "\n"
 "Füge die angegebene(n) Datei(en) demobersten Patch hinzu, und editiere\n"
@@ -982,7 +983,8 @@ msgstr ""
 "Bitte führen Sie \\`quilt upgrade' aus.\\n"
 
 #: ../scripts/rpatch.in:22
-msgid "Usage: $0 [-fRq] patchname\\n"
+#, fuzzy
+msgid "Usage: %s [-fRq] patchname\\n"
 msgstr "Verwendung: $0 [-fRq] patchname\\n"
 
 #: ../scripts/rpatch.in:100
diff --git a/quilt/diff.in b/quilt/diff.in
index db3c98e..15d182e 100644
--- a/quilt/diff.in
+++ b/quilt/diff.in
@@ -70,7 +70,7 @@ included.
 
 colorize() {
 	if [ -n "$opt_color" ]; then
-		awk '
+		@AWK@ '
 		function esc(x) { return "'$'\e''[" x "m" }
 		{ if (/^(Index:|\-\-\-|\+\+\+|\*\*\*) /)
 		    print esc(32) $0 esc(0)
diff --git a/quilt/grep.in b/quilt/grep.in
index de583d0..8b8261d 100644
--- a/quilt/grep.in
+++ b/quilt/grep.in
@@ -120,7 +120,7 @@ find "${myargs[@]}" \( \
 	-type f -print \
 | xargs grep $opt_H "${args[@]}" \
 | if [ ${#myargs[@]} -eq 0 ]; then
-	sed -e 's,^./,,'
+	@SED@ -e 's,^./,,'
 else
 	cat
 fi
diff --git a/quilt/refresh.in b/quilt/refresh.in
index c41e70c..21f575f 100644
--- a/quilt/refresh.in
+++ b/quilt/refresh.in
@@ -210,7 +210,7 @@ tmp_result=$(gen_tempfile) || die 1
 if [ -n "$opt_diffstat" ]
 then
 	diffstat="$(@DIFFSTAT@ $tmp_patch)" || die 1
-	awk '
+	@AWK@ '
 	    function print_diffstat(arr, i) {
 	      split(diffstat, arr, "\n")
 	      for (i=1; i in arr; i++)
diff --git a/quilt/setup.in b/quilt/setup.in
index 798e40d..94ed844 100644
--- a/quilt/setup.in
+++ b/quilt/setup.in
@@ -89,7 +89,7 @@ up() {
 
 check_for_existing_files() {
 	local dir status=0
-	for dir in $(awk ' $1 = "patch"	{ print $2 }' $tmpfile | uniq)
+	for dir in $(@AWK@ ' $1 = "patch" { print $2 }' $tmpfile | uniq)
 	do
 		if [ -e "$prefix$dir/$QUILT_PATCHES" ]
 		then
diff --git a/quilt/snapshot.in b/quilt/snapshot.in
index 2056267..4201370 100644
--- a/quilt/snapshot.in
+++ b/quilt/snapshot.in
@@ -78,7 +78,7 @@ mkdir -p $QUILT_PC/$snap_subdir
 for patch in $(applied_patches); do
 	files_in_patch $patch
 done \
-| awk ' # filter out duplicates
+| @AWK@ ' # filter out duplicates
 	{ if (seen[$0])
 	      next
 	  seen[$0] = 1
diff --git a/scripts/apatch.in b/scripts/apatch.in
index 07009e7..6ab07b9 100755
--- a/scripts/apatch.in
+++ b/scripts/apatch.in
@@ -90,7 +90,7 @@ apatch()
 	then
 		# The reject files are removed in rollback_patch.
 		echo "$output" \
-		| sed -e \
+		| @SED@ -e \
 's/-- saving rejects to file \(.\+\)\.rej/-- rejects in file \1/'
 	elif [ -n "$output" ]
 	then
diff --git a/scripts/patchfns.in b/scripts/patchfns.in
index fa03909..f1ee98f 100644
--- a/scripts/patchfns.in
+++ b/scripts/patchfns.in
@@ -235,7 +235,7 @@ rename_in_db()
 	local from=$1 to=$2
 	local tmpfile
 	tmpfile=$(gen_tempfile) || return 1
-	/usr/bin/gawk '
+	@AWK@ '
 	/^'"$(quote_re $from)"'$/ \
 		{ sub(/'"$(quote_re $from)"'/, "'"${to//\"/\\\"}"'")
 		  good=1 }
@@ -467,7 +467,7 @@ files_in_patch_ordered()
 	(   files_in_patch $patch
 	    echo "-"
 	    filenames_in_patch $patch
-	) | awk '
+	) | @AWK@ '
 	$1 == "-" { out=1 ; next }
 	!out	{ files[$0]=1 }
 	out	{ if ($0 in files && !($0 in printed)) {
-- 
cgit