- don't pollute specdir with builder macros

[packages/rpm-build-tools.git] / adapter.sh

diff --git a/adapter.sh b/adapter.sh
index 8483db63b534ac6030fdb89dd3bfea5c9bc1661e..b012c2f7a0d15047008eba70f65e87363d596174 100644 (file)
--- a/adapter.sh
+++ b/adapter.sh
@@ -1,15 +1,15 @@
 #!/bin/sh
 #
-# This is adapter v0.27. Adapter adapts .spec files for PLD Linux.
+# This is adapter v0.28. Adapter adapts .spec files for PLD Linux.
 #
 # Copyright (C) 1999-2003 PLD-Team <feedback@pld-linux.org>
 # Authors:
-#      Micha³ Kuratczyk <kura@pld.org.pl>
+#      Michał Kuratczyk <kura@pld.org.pl>
 #      Sebastian Zagrodzki <s.zagrodzki@mimuw.edu.pl>
-#      Tomasz K³oczko <kloczek@rudy.mif.pg.gda.pl>
+#      Tomasz Kłoczko <kloczek@rudy.mif.pg.gda.pl>
 #      Artur Frysiak <wiget@pld-linux.org>
 #      Michal Kochanowicz <mkochano@pld.org.pl>
-#      Elan Ruusamäe <glen@pld-linux.org>
+#      Elan Ruusamäe <glen@pld-linux.org>
 #
 # See cvs log adapter{,.awk} for list of contributors
 #
@@ -128,9 +128,9 @@ adapterize()
 {
         local tmpdir
         tmpdir=$(mktemp -d ${TMPDIR:-/tmp}/adapter-XXXXXX) || exit
-        awk -f adapter.awk $SPECFILE > $tmpdir/$SPECFILE || exit
+        gawk -f adapter.awk $SPECFILE > $tmpdir/$SPECFILE || exit
 
-        if [ "`diff --brief $SPECFILE $tmpdir/$SPECFILE`" ] ; then
+        if [ "`diff --brief $SPECFILE $tmpdir/$SPECFILE`" ]; then
                  diff -u $SPECFILE $tmpdir/$SPECFILE > $tmpdir/$SPECFILE.diff
                  if [ -t 1 ]; then
                                diffcol $tmpdir/$SPECFILE.diff | less -r
@@ -147,12 +147,15 @@ adapterize()
                                                  diff2hunks $tmpdir/$SPECFILE.diff
                                                  for t in $(ls $tmpdir/$SPECFILE-*.diff); do
                                                                diffcol $t | less -r
-                                                               echo -n "Accept? (Yes, [N]o)? "
+                                                               echo -n "Accept? (Yes, [N]o, Quit)? "
                                                                read ans
                                                                case "$ans" in
                                                                [yYoO]) # y0 mama
                                                                        patch < $t
                                                                        ;;
+                                                               [Q])  # Abort
+                                                                       break
+                                                                       ;;
                                                                esac
                                                  done
                                                  break