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

[Dan McGee]

On Tue, Aug 16, 2011 at 2:21 AM, Sebastien Luttringer <seblu at seblu.net> wrote:
> 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>
> ---

The reason we don't have this is when I first introduced --source in
2007 in commit f4d6efeee, this option still existed:
        echo "$(gettext "  -S, --usesudo    When calling pacman, use sudo")"
--usesudo has been gone since 2007, so I think we can reuse -S 4 years
later now- anyone disagree?

Can't take this patch until doc/makepkg.8.txt is updated too though...

>  contrib/bash_completion.in |    2 +-
>  scripts/makepkg.sh.in      |    6 +++---
>  2 files changed, 4 insertions(+), 4 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/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index f464014..3bbbf7c 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