[pacman-dev] [PATCH] Add makepkg -S which is and alias to makepkg --source

Sebastien Luttringer seblu at seblu.net
Thu Aug 18 06:46:19 EDT 2011


makepkg --source is a often used go make source package like for AUR.
Have a -S shortcut will save the world.

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

diff --git a/contrib/bash_completion.in b/contrib/bash_completion.in
index af5de17..8fa3da6 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 c d e f g h i m o p r s')
+          'A L R S c d e f g h i m o p r s')
     _arch_ptr2comp opts
   fi
   true
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index 3206a90..ca5a273 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -145,7 +145,7 @@ Options
 	such as a chroot or remote builder. It will also satisfy requirements of
 	the GPL when distributing binary packages.
 
-*\--source*::
+*-S, \--source*::
 	Do not actually build the package, but build a source-only tarball that
 	does not include sources that can be fetched via a download URL. This is
 	useful for passing a single tarball to another program such as a chroot,
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index e73fdfa..8555db3 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1844,6 +1844,7 @@ usage() {
 	echo "$(gettext "  -r, --rmdeps     Remove installed dependencies after a successful build")"
 	echo "$(gettext "  -R, --repackage  Repackage contents of the package without rebuilding")"
 	printf "$(gettext "  -s, --syncdeps   Install missing dependencies with %s")\n" "pacman"
+	echo "$(gettext "  -S, --source     Generate a source-only tarball without downloaded sources")"
 	echo "$(gettext "  --allsource      Generate a source-only tarball including downloaded sources")"
 	printf "$(gettext "  --asroot         Allow %s to run as root user")\n" "makepkg"
 	printf "$(gettext "  --check          Run the %s function in the %s")\n" "check()" "$BUILDSCRIPT"
@@ -1857,7 +1858,6 @@ usage() {
 	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 "$(gettext "  --source         Generate a source-only tarball without downloaded sources")"
 	echo
 	printf "$(gettext "These options can be passed to %s:")\n" "pacman"
 	echo
@@ -1889,7 +1889,7 @@ fi
 ARGLIST=("$@")
 
 # Parse Command Line Options.
-OPT_SHORT="AcdefFghiLmop:rRsV"
+OPT_SHORT="AcdefFghiLmop: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"
@@ -1940,8 +1940,8 @@ while true; do
 		--skipinteg)      SKIPCHECKSUMS=1; SKIPPGPCHECK=1 ;;
 		--skippgpcheck)   SKIPPGPCHECK=1;;
 		--sign)           SIGNPKG='y' ;;
-		--source)         SOURCEONLY=1 ;;
 		-s|--syncdeps)    DEP_BIN=1 ;;
+		-S|--source)      SOURCEONLY=1 ;;
 
 		-h|--help)        usage; exit 0 ;; # E_OK
 		-V|--version)     version; exit 0 ;; # E_OK
-- 
Sebastien "Seblu" Luttringer



More information about the pacman-dev mailing list