[pacman-dev] [RFC v2 02/13] pacdiff: streamline option syntax with makepkg

Gordian Edenhofer gordian.edenhofer at gmail.com
Thu Sep 29 12:41:15 UTC 2016


Allow for '-m' as abbreviation for '--nocolor'.

Signed-off-by: Gordian Edenhofer <gordian.edenhofer at gmail.com>
---
 contrib/pacdiff.sh.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in
index cd93164..3394993 100644
--- a/contrib/pacdiff.sh.in
+++ b/contrib/pacdiff.sh.in
@@ -47,7 +47,7 @@ Search Options:     select one (default: --pacmandb)
 
 General Options:
   -o/--output       print files instead of merging them
-  --nocolor         remove colors from output
+  -m/--nocolor      remove colors from output
 
 Environment Variables:
   DIFFPROG          override the merge program: (default: 'vim -d')
@@ -96,7 +96,7 @@ cmd() {
 }
 
 # Parse arguments
-OPT_SHORT='lfpoVh'
+OPT_SHORT='lfpomVh'
 OPT_LONG=('locate' 'find' 'pacmandb' 'output' 'nocolor' 'version' 'help')
 if ! parseopts "$OPT_SHORT" "${OPT_LONG[@]}" -- "$@"; then
 	usage
@@ -115,7 +115,7 @@ while :; do
 			USE_PACDB=1;;
 		-o|--output)
 			OUTPUTONLY=1;;
-		--nocolor)
+		-m|--nocolor)
 			USE_COLOR='n';;
 		-V|--version)
 			version
-- 
2.10.0


More information about the pacman-dev mailing list