[packages/adapter: 341/631] - add Q to abort chunkmode

glen glen at pld-linux.org
Mon Sep 12 20:03:02 CEST 2016


commit 9ebf8751d80d0552fcec5cda98b2549e5b58fa83
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Tue Oct 24 23:02:33 2006 +0000

    - add Q to abort chunkmode
    
    Changed files:
        adapter.sh -> 1.16

 adapter.sh | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/adapter.sh b/adapter.sh
index 8483db6..0b467f2 100644
--- a/adapter.sh
+++ b/adapter.sh
@@ -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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885



More information about the pld-cvs-commit mailing list