[pacman-dev] [PATCH 5/5] Add makepkg -G which is like --skipinteg

[Sebastien Luttringer]

makepkg --skipinteg is a often used to test package and it's the brother of -g option.
Have a -G shortcut will help to reduce CO².

Signed-off-by: Sebastien Luttringer <seblu at seblu.net>
---
 contrib/bash_completion.in |    2 +-
 scripts/makepkg.sh.in      |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in
index 8fa3da6..79a5154 100644
--- a/contrib/bash_completion.in
+++ b/contrib/bash_completion.in
@@ -35,7 +35,7 @@ _makepkg() {
     opts=('allsource asroot check clean config force geninteg help holdver ignorearch
            install log nobuild nocheck nocolor noconfirm nodeps noextract noprogressbar
            nosign pkg repackage rmdeps sign skipinteg source syncdeps'
-          'A L R S c d e f g h i m o p r s')
+          'A G L R S c d e f g h i m o p r s')
     _arch_ptr2comp opts
   fi
   true
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 0121f77..4a17999 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1834,6 +1834,7 @@ usage() {
 	printf "$(gettext "  -e, --noextract  Do not extract source files (use existing %s dir)")\n" "src/"
 	echo "$(gettext "  -f, --force      Overwrite existing package")"
 	echo "$(gettext "  -g, --geninteg   Generate integrity checks for source files")"
+	echo "$(gettext "  -G, --skipinteg  Do not fail when integrity checks are missing")"
 	echo "$(gettext "  -h, --help       Show this help message and exit")"
 	echo "$(gettext "  -i, --install    Install package after successful build")"
 	echo "$(gettext "  -L, --log        Log package build process")"
@@ -1855,7 +1856,6 @@ usage() {
 	echo "$(gettext "  --pkg <list>     Only build listed packages from a split package")"
 	printf "$(gettext "  --sign           Sign the resulting package with %s")\n" "gpg"
 	echo "$(gettext "  --skipchecksums  Do not verify checksums of the source files")"
-	echo "$(gettext "  --skipinteg      Do not perform any verification checks on source files")"
 	echo "$(gettext "  --skippgpcheck   Do not verify source files with PGP signatures")"
 	echo
 	printf "$(gettext "These options can be passed to %s:")\n" "pacman"
@@ -1888,7 +1888,7 @@ fi
 ARGLIST=("$@")
 
 # Parse Command Line Options.
-OPT_SHORT="AcdefFghiLmop:rRsSV"
+OPT_SHORT="AcdefFgGhiLmop:rRsSV"
 OPT_LONG="allsource,asroot,ignorearch,check,clean,nodeps"
 OPT_LONG+=",noextract,force,forcever:,geninteg,help,holdver,skippgpcheck"
 OPT_LONG+=",install,key:,log,nocolor,nobuild,nocheck,nosign,pkg:,rmdeps"
@@ -1923,6 +1923,7 @@ while true; do
 		--forcever)       shift; FORCE_VER=$1;;
 		-F)               INFAKEROOT=1 ;;
 		-g|--geninteg)    GENINTEG=1 ;;
+		-G|--skipinteg)   SKIPINTEG=1 ;;
 		--holdver)        HOLDVER=1 ;;
 		-i|--install)     INSTALL=1 ;;
 		--key)            shift; GPGKEY=$1 ;;
@@ -1935,9 +1936,12 @@ while true; do
 		--pkg)            shift; PKGLIST=($1) ;;
 		-r|--rmdeps)      RMDEPS=1 ;;
 		-R|--repackage)   REPKG=1 ;;
+<<<<<<< HEAD
 		--skipchecksums)  SKIPCHECKSUMS=1 ;;
 		--skipinteg)      SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;;
 		--skippgpcheck)   SKIPPGPCHECK=1;;
+=======
+>>>>>>> Add makepkg -G which is like --skipinteg
 		--sign)           SIGNPKG='y' ;;
 		-s|--syncdeps)    DEP_BIN=1 ;;
 		-S|--source)      SOURCEONLY=1 ;;
-- 
Sebastien "Seblu" Luttringer