]> git.pld-linux.org Git - packages/adapter.git/commitdiff
- add Q to abort chunkmode
authorElan Ruusamäe <glen@pld-linux.org>
Tue, 24 Oct 2006 23:02:33 +0000 (23:02 +0000)
committerElan Ruusamäe <glen@pld-linux.org>
Tue, 24 Oct 2006 23:02:33 +0000 (23:02 +0000)
Changed files:
    adapter.sh -> 1.16

adapter.sh

index 8483db63b534ac6030fdb89dd3bfea5c9bc1661e..0b467f21eb77f8155cc68f38e7c80cd9aa58582e 100644 (file)
@@ -130,7 +130,7 @@ adapterize()
         tmpdir=$(mktemp -d ${TMPDIR:-/tmp}/adapter-XXXXXX) || exit
         awk -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
This page took 0.030249 seconds and 4 git commands to generate.