- Pacman-dev - lists.archlinux.org

[pacman-dev] PKGBUILD man page
by Allan McRae 13 May '10

13 May '10

More as a reminder to me that I need to fix this: --begin quote-- Note If you are using Arch Linux and have a local copy of the Arch Build System (ABS) tree on your computer, or are using another distribution that provides a similar tree of build files, you can copy the provided PKGBUILD.proto file to a new package build directory and make customizations to suit your needs. An up to date prototype file can also be found in the source distribution of this package. --end quote-- The protoype is provided by the pacman package and not ABS.

3 3

[pacman-dev] [PATCH] rankmirrors: Add a --repo option to target a specific repo
by Daenyth Blank 13 May '10

13 May '10

--- scripts/rankmirrors.sh.in | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index d5cbadd..54b04e0 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -35,6 +35,7 @@ usage() { echo " -t, --times only output mirrors and their response times" echo " -u, --url test a specific url" echo " -v, --verbose be verbose in ouptut" + echo " -r, --repo specify a specific repo name instead of guessing" exit 0 } @@ -69,13 +70,18 @@ ARCH="$(uname -m)" getfetchurl() { local strippedurl="${1%/}" - local replacedurl="${strippedurl//'$repo'/core}" - replacedurl="${replacedurl//'$arch'/$ARCH}" + local replacedurl="${replacedurl//'$arch'/$ARCH}" + if [[ $TARGETREPO ]]; then + replacedurl="${strippedurl//'$repo'/core}" + local tmp="${replacedurl%/*}" + tmp="${tmp%/*}" - local tmp="${replacedurl%/*}" - tmp="${tmp%/*}" + local reponame="${tmp##*/}" + else + replacedurl="${strippedurl//'$repo'/$TARGETREPO}" + local reponame="$TARGETREPO" + fi - local reponame="${tmp##*/}" if [[ -z $reponame || $reponame = $replacedurl ]]; then echo "fail" else @@ -119,6 +125,7 @@ while [[ $1 ]]; do times) TIMESONLY=1 ; shift ;; verbose) VERBOSE=1 ; shift ;; url) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; shift 2;; + repo) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; shift 2;; *) err "\`$1' is an invalid argument." esac elif [[ ${1:0:1} = - ]]; then @@ -136,6 +143,7 @@ while [[ $1 ]]; do t) TIMESONLY=1 ;; v) VERBOSE=1 ;; u) CHECKURL=1; [[ $2 ]] || err "Must specify url."; URL="$2"; snum=2;; + r) [[ $2 ]] || err "Must specify repo name."; TARGETREPO="$2"; snum=2;; n) [[ $2 ]] || err "Must specify number." ; NUM="$2" ; snum=2;; *) err "\`-$1' is an invald argument." ;; esac @@ -182,6 +190,7 @@ for line in "${linearray[@]}"; do # Getting values and times and such server="${line#*= }" + server="${server%%#*}" url="$(getfetchurl "$server")" [[ $url = fail ]] && err "url \`$URL' is malformed." time=$(gettime "$url") -- 1.7.0

3 9

[pacman-dev] [PATCH 1/2] Add 'pkgbase' highlighting to vim syntax file
by Dan McGee 13 May '10

13 May '10

Simple change and probably a bit too copy/paste, but works for now. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- PKGBUILD-split.proto | 2 +- contrib/PKGBUILD.vim | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/PKGBUILD-split.proto b/PKGBUILD-split.proto index 0cbd563..484cb1a 100644 --- a/PKGBUILD-split.proto +++ b/PKGBUILD-split.proto @@ -5,7 +5,7 @@ # Maintainer: Your Name <youremail(a)domain.com> pkgname=('pkg1' 'pkg2') -pkgbase="" +pkgbase=BASE pkgver=VERSION pkgrel=1 pkgdesc="" diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index a1112e5..90b628e 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -25,6 +25,13 @@ syn match pbValidPkgname /$[[:alnum:]]\|+\|-\|_${,32}/ contained contains=pbIl syn match pbIllegalPkgname /[[:upper:]]\|[^[:alnum:]-+_=]\|=.*=\|=['"]\?.\{33,\}['"]\?/ contained syn match pbPkgnameGroup /^pkgname=.*/ contains=pbIllegalPkgname,pb_k_pkgname,shDoubleQuote,shSingleQuote +" pkgbase +" FIXME if '=' is in pkgbase/pkgname/pkgver, it highlights whole string, not just '=' +syn keyword pb_k_pkgbase pkgbase contained +syn match pbValidPkgbase /$[[:alnum:]]\|+\|-\|_${,32}/ contained contains=pbIllegalPkgbase +syn match pbIllegalPkgbase /[[:upper:]]\|[^[:alnum:]-+_=]\|=.*=\|=['"]\?.\{33,\}['"]\?/ contained +syn match pbPkgbaseGroup /^pkgbase=.*/ contains=pbIllegalPkgbase,pb_k_pkgbase,shDoubleQuote,shSingleQuote + " pkgver syn keyword pb_k_pkgver pkgver contained syn match pbValidPkgver /$[[:alnum:]]\|\.\|+\|_$/ contained contains=pbIllegalPkgver @@ -133,7 +140,6 @@ syn match pbDerefEmulation /\$[{]\?[[:alnum:]_]*[}]\?/ contained hi def link pbDerefEmulation PreProc " md5sums - syn keyword pb_k_md5sums md5sums contained syn match pbIllegalMd5sums /[^='"()\/ ]/ contained contains=pbValidMd5sums syn match pbValidMd5sums /[[:alnum:]]\{32\}/ contained @@ -187,6 +193,9 @@ hi def link pbTodo Todo hi def link pbIllegalPkgname Error hi def link pb_k_pkgname pbKeywords +hi def link pbIllegalPkgbase Error +hi def link pb_k_pkgbase pbKeywords + hi def link pbIllegalPkgver Error hi def link pb_k_pkgver pbKeywords -- 1.7.1

1 1

[pacman-dev] [PATCH] PKGBUILD.vim : update valid licenses
by Xavier Chantry 13 May '10

13 May '10

Updated list with : echo $(pacman -Ql licenses | grep "/usr/share/licenses/common/.*/$" | cut -d'/' -f6 ) Maybe PKGBUILD.vim could do this at runtime ? Signed-off-by: Xavier Chantry <chantry.xavier(a)gmail.com> --- contrib/PKGBUILD.vim | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index af0f981..55a5161 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -54,7 +54,7 @@ syn match pbUrlGroup /^url=.*/ contains=pbValidUrl,pb_k_url,pbIllegalUrl,shDoubl " license syn keyword pb_k_license license contained -syn keyword pbLicense APACHE CDDL EPL FDL GPL LGPL MPL PHP RUBY ZLIB ISC MIT BSD contained +syn keyword pbLicense APACHE CCPL CDDL CPL EPL FDL1.2 FDL1.3 GPL2 GPL3 LGPL2.1 LGPL3 LPPL MPL PHP PSF PerlArtistic RALINK RUBY ZPL contained syn match pbLicenseCustom /custom$:[[:alnum:]]*$*/ contained syn match pbIllegalLicense /[^='"() ]/ contained contains=pbLicenseCustom,pbLicense syn region pbLicenseGroup start=/^license=(/ end=/)/ contains=pb_k_license,pbLicenseCustom,pbLicense,pbIllegalLicense -- 1.7.1

2 1

[pacman-dev] [GIT] The official pacman repository branch, master, updated. v3.3.3-174-g7f02f7c
by dan＠archlinux.org 11 May '10

11 May '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "The official pacman repository". The branch, master has been updated via 7f02f7cb9fba13a8e9762d30d7e0648b257ec091 (commit) via 364ebf4e16658f36d4dbff997916c8ccec4d2b79 (commit) via 2ce444ee1099d837d4a1a2978edfdfc9d5fe9d96 (commit) via 79987c92cb07c67914adf1febcc5ebdecf2a09b7 (commit) via 64c3255b0e03190a35a1cef4bbc8b75b6be72684 (commit) via 590606a5d7c699e4d4705501377ca83fb696b61c (commit) via ccbef232c97fda061eee54a96bcd60b13a77f5d1 (commit) via df99495b826eab9f25ceeb8f2643565af8818c20 (commit) from d485c0370f554758a28eff2cc32b2cc9c72a4604 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7f02f7cb9fba13a8e9762d30d7e0648b257ec091 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Mar 7 13:02:37 2010 +1000 Allow -Qo to perform a functional 'which' When pacman queries the ownership of an object that is not a path, it will check in the users PATH for a match. Implements FS#8798. Dan: did some small refactoring and error message changes when PATH is searched and nothing is found. Original-patch-by: Shankar <jatheendra(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 364ebf4e16658f36d4dbff997916c8ccec4d2b79 Author: David Campbell <davekong(a)archlinux.us> Date: Sat Apr 3 17:20:00 2010 -0400 Switch Contributor line with Maintainer line. When someone is creating a new PKGBUILD he will most likely be the maintainer not a contributor. Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 2ce444ee1099d837d4a1a2978edfdfc9d5fe9d96 Author: Allan McRae <allan(a)archlinux.org> Date: Sun Oct 11 21:50:45 2009 +1000 makepkg: rework --skipinteg The current --skipinteg is a bit weird. It does not skip integrity checks, but instead does them and prints a warning. Change this behaviour to actually skipping the checks. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 79987c92cb07c67914adf1febcc5ebdecf2a09b7 Author: Xavier Chantry <shiningxc(a)gmail.com> Date: Wed Oct 14 20:07:28 2009 +0200 makepkg -g: use checksums defined in the pkgbuild Signed-off-by: Xavier Chantry <shiningxc(a)gmail.com> [Allan: amend documentation] Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit 64c3255b0e03190a35a1cef4bbc8b75b6be72684 Author: Allan McRae <allan(a)archlinux.org> Date: Mon Apr 26 14:59:42 2010 +1000 makepkg: handle multiple install and changelog files The presence of all install and changelog files (multiple files may be used with package splitting) is checked for in check_sanity(). All install and changelog files are copied to the source location when using --source. The check for install and changelog file presence is removed in create_srcpackage() as this is redundant to the checks performed in check_sanity(). Moved install and changelog handling in create_srcpackage() to after source array files, as this is more logical and readily allows for the following. A check is made when creating a source package that a symlink to an install file has not already been added. This can occur if the install file is used multiple times or if it is listed in the source array. Fixes FS#18831, FS#18394 and partially fixes FS#16004 Signed-off-by: Allan McRae <allan(a)archlinux.org> commit 590606a5d7c699e4d4705501377ca83fb696b61c Author: Ray Kohler <ataraxia937(a)gmail.com> Date: Thu Mar 4 21:57:46 2010 -0500 makepkg: fall back to su if sudo is not available Signed-off-by: Ray Kohler <ataraxia937(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit ccbef232c97fda061eee54a96bcd60b13a77f5d1 Author: Allan McRae <allan(a)archlinux.org> Date: Fri Oct 23 15:30:47 2009 +1000 makepkg: improve removal of installed dependencies Compare a list of packages on the system before and after dependency resolution in order to get a complete list of packages to remove. This allows makepkg to remove packages installed due to provides. Bail in cases where packages that were on the system originally have been removed as there is a risk of breaking the system when removing the new packages. Fixes FS#15144. Signed-off-by: Allan McRae <allan(a)archlinux.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> commit df99495b826eab9f25ceeb8f2643565af8818c20 Author: Jonathan Conder <j(a)skurvy.no-ip.org> Date: Thu May 6 10:07:37 2010 +1200 Compute package download size outside _alpm_sync_prepare And add a new info level for this piece of data. Signed-off-by: Jonathan Conder <j(a)skurvy.no-ip.org> Signed-off-by: Dan McGee <dan(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: PKGBUILD-split.proto | 2 +- PKGBUILD.proto | 2 +- doc/makepkg.8.txt | 18 +++--- lib/libalpm/db.h | 3 +- lib/libalpm/sync.c | 15 ++++- scripts/makepkg.sh.in | 161 ++++++++++++++++++++++++++++++++---------------- src/pacman/query.c | 64 ++++++++++++++++++-- 7 files changed, 193 insertions(+), 72 deletions(-) hooks/post-receive -- The official pacman repository

1 0

[pacman-dev] [PATCH] Allow -Qo to perform a functional 'which'
by Allan McRae 10 May '10

10 May '10

When pacman queries the ownership of an object that is not a path, it will check in the users PATH for a match. Implements FS#8798. Original-patch-by: Shankar <jatheendra(a)gmail.com> Signed-off-by: Allan McRae <allan(a)archlinux.org> --- This should address all comments I had when this was submitted a few months back. src/pacman/query.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 52 insertions(+), 5 deletions(-) diff --git a/src/pacman/query.c b/src/pacman/query.c index 6b6a25d..038072f 100644 --- a/src/pacman/query.c +++ b/src/pacman/query.c @@ -56,10 +56,44 @@ static char *resolve_path(const char* file) return(str); } +/* check if filename exists in PATH */ +static int search_path(char *filename, size_t size, struct stat * bufptr) +{ + char *envpath, *envpathsplit, *path, fullname[PATH_MAX+1]; + int len; + + if ((envpath = getenv("PATH")) == NULL) { + return(-1); + } + if ((envpath = envpathsplit = strdup(envpath)) == NULL) { + return(-1); + } + + while ((path = strsep(&envpathsplit, ":")) != NULL) { + len = strlen(path); + + /* strip the trailing slash if one exists */ + while(path[len - 1] == '/') { + path[--len] = '\0'; + } + + snprintf(fullname, sizeof(fullname), "%s/%s", path, filename); + + if(stat(fullname, bufptr) == 0) { + strncpy(filename, fullname, size); + free(envpath); + return(0); + } + } + free(envpath); + return(-1); +} + static int query_fileowner(alpm_list_t *targets) { int ret = 0; alpm_list_t *t; + size_t len=PATH_MAX+1; /* This code is here for safety only */ if(targets == NULL) { @@ -67,19 +101,31 @@ static int query_fileowner(alpm_list_t *targets) return(1); } + char *filename = calloc(len, sizeof(char)); + for(t = targets; t; t = alpm_list_next(t)) { int found = 0; - char *filename = alpm_list_getdata(t); + strncpy(filename, alpm_list_getdata(t), len); char *bname, *dname, *rpath; const char *root; struct stat buf; alpm_list_t *i, *j; if(lstat(filename, &buf) == -1) { - pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), - filename, strerror(errno)); - ret++; - continue; + /* if it is not a path but a program name, then check in PATH */ + if(strchr(filename, '/') == NULL) { + if(search_path(filename, len, &buf) == -1) { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } + } else { + pm_fprintf(stderr, PM_LOG_ERROR, _("failed to read file '%s': %s\n"), + filename, strerror(errno)); + ret++; + continue; + } } if(S_ISDIR(buf.st_mode)) { @@ -140,6 +186,7 @@ static int query_fileowner(alpm_list_t *targets) free(rpath); } + free(filename); return ret; } -- 1.7.0.1

4 6

Re: [pacman-dev] [PATCH] [bash_completion] Undeclared local vars/filenames with spaces/other
by Xavier Chantry 09 May '10

09 May '10

On Sat, May 8, 2010 at 10:31 AM, Xavier Chantry <shiningxc(a)gmail.com> wrote: > > > Attached list of changes between maint and master, + the new patch > rebased on top of master. > > Of course if you want to keep working on it, you're very welcome to do so :) > What mostly annoyed me with pacman bash completion is the lag/delay on completing packages in pacman -S. That clearly feels better after your patch, but I've noticed a funny problem and different behavior. I am sitting in my pacman git tree, and wanted to reinstall pacman : $ pacman -S pac<tab> after your patch : $ sudo pacman -S pac pacbuild pacman-contrib pacman-mirrorlist paco pacpan pacupdate before : $ sudo pacman -S pac pacbuild pacman/ pacman-contrib pacman-mirrorlist paco pacpan pacupdate So actually I couldnt complete pacman with your patch, it proposed me pacman- directly. The old behavior didnt propose me pacman either, but since it hesitated between pacman/ and pacman- , the completion stopped on pacman which is the good package name :) And this weird behavior is because I had a pacman dir in my PWD : $ ls -ld pacman/ drwxr-xr-x 2 xavier users 4096 Sep 23 2009 pacman/

2 1

[pacman-dev] Provides/replaces fields and backup files
by Nezmer 09 May '10

09 May '10

Hi, Suppose package B replaces package A. Both packages share the same content with minor differences. They both have many backup files with the same initial content. When package B replaces package A. Modified backup files will move to <backupfile.pacsave>. What If pacman could check for initial content of the backup files for both packages and If the content is the same, treat those backup files as If the process is a package upgrade not a package replacement. This is a real-life example. Packages A and B contain files like "/etc/passwd" and "/etc/group". So not moving the files to ".pacsave" adds more than a convenience for the lazy. My C skills are next-to-zero so unfortunately I can't help coding this. Do you consider this a valid minor bug? Should I report this to flyspray?

3 2

[pacman-dev] [PATCH] [bash_completion] Undeclared local vars/filenames with spaces/other
by Andres Perera 08 May '10

08 May '10

Fix: 3 Undeclared local vars with common enough names to warrant breakage Performance issues with _pacman trying to replicate /usr/bin/pacman with find and other slow tools. Performance issues with expanding an array (with sometimes hundreds of items) over three times. Expanding said array to remove already completed entries had the side effect of braking filenames with spaces and or \n. The full description of fixes are already posted at: http://bugs.archlinux.org/task/16630#comment55779 along with time diffs. Signed-off-by: Andres P <andres87p(a)gmail.com> --- contrib/bash_completion | 535 ++++++++++++++++++----------------------------- 1 files changed, 202 insertions(+), 333 deletions(-) diff --git a/contrib/bash_completion b/contrib/bash_completion index 62e5bc9..65051f5 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -1,365 +1,234 @@ -# vim: set ft=sh ts=2 sw=2 et: -# file: /etc/bash_completion.d/pacman - -# Bash completion for pacman -# Original: Manolis Tzanidakis <mtzanidakis(a)freemail.gr> +# pacman/makepkg completion by Andres Perera <andres87p gmail> # -# Distributed under the terms of the GNU General Public License, v2 or later. +# Distributed under the terms of the GNU General Public License v3 or +# later. # - -## initial functions - -rem_selected () -{ - # (Adapted from bash_completion by Ian Macdonald <ian(a)caliban.org>) - # This removes any options from the list of completions that have - # already been specified on the command line. - COMPREPLY=($(/bin/echo "${COMP_WORDS[@]}" | \ - (while read -d ' ' i; do - [ "${i}" == "" ] && continue - # flatten array with spaces on either side, - # otherwise we cannot grep on word boundaries of - # first and last word - COMPREPLY=" ${COMPREPLY[@]} " - # remove word from list of completions - COMPREPLY=(${COMPREPLY/ ${i%% *} / }) +# Local variables: common core cur glob list long m o prev query r +# remove s short sync upgrade w +# +# vim: ft=sh sts=2 sw=2 et: + +# Removes packages/files already present in the line +_arch_rem_selected() { + local w r + + for (( w=0; w<${#COMP_WORDS[@]}-1; w++)); do + # Don't touch operands + [[ ${COMP_WORDS[w]} == -* ]] && continue + for r in "${!COMPREPLY[@]}"; do + # Only deal with full matches + if [[ ${COMP_WORDS[w]} == ${COMPREPLY[r]} ]]; then + unset 'COMPREPLY[r]'; break + fi done - /bin/echo ${COMPREPLY[@]}))) - return 0 -} - -_available_repos () -{ - COMPREPLY=( $( compgen -W "$(/bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' )" -- $cur ) ) -} - -_installed_pkgs () -{ - local installed_pkgs - installed_pkgs=$( /bin/ls /var/lib/pacman/local/ ) - COMPREPLY=( $( compgen -W "$( for i in $installed_pkgs; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) + done } -_available_pkgs () -{ - #find balks easilly on a find /foo/*/* type dir, especially one like - # /var/lib/pacman/*/* - # This little change-up removes the find *and* only uses enabled repos - local available_pkgs - local enabled_repos - enabled_repos=$( /bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' ) - available_pkgs=$( for r in $enabled_repos; do /bin/echo /var/lib/pacman/sync/$r/*; done ) - COMPREPLY=( $( compgen -W "$( for i in $available_pkgs; do j=${i##*/}; echo ${j%-*-*}; done )" -- $cur ) ) -} +# makepkg purge functions +_makepkg_deselect() { + local o -_installed_groups () -{ - local installed_groups - installed_groups=$( /bin/find /var/lib/pacman/local -name desc -exec /bin/sed -ne '/%GROUPS%/,/^$/{//d; p}' {} \; | /bin/sort -u ) - COMPREPLY=( $( compgen -W "$( for i in $installed_groups; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) + if [[ $1 == l ]]; then + for o in "${!long[@]}"; do + if [[ ${COMP_WORDS[w]} == ${long[o]} ]]; then + unset 'long[o]'; break + fi + done + else + for o in "${!short[@]}"; do + if [[ ${COMP_WORDS[w]} == -*([^- ])${short[o]}* ]]; then + unset 'short[o]' + fi + done + fi } -_available_groups () -{ - #find balks easilly on a find /foo/*/* type dir, especially one like - # /var/lib/pacman/*/* - # This little change-up removes the find *and* only uses enabled repos - local available_groups - local enabled_repos - enabled_repos=$( /bin/grep '\[' /etc/pacman.conf | /bin/grep -v -e 'options' -e '^#' | tr -d '[]' ) - available_groups=$( for r in $enabled_repos; do /bin/sed '/%GROUPS%/,/^$/{//d; p}' /var/lib/pacman/sync/$r/*/desc | /bin/sort -u; done ) - COMPREPLY=( $( compgen -W "$( for i in $available_groups; do /bin/echo ${i%-*-*}; done )" -- $cur ) ) +_makepkg_count_words() { + local w + + for (( w=0; w<${#COMP_WORDS[@]}; w++)); do + [[ ${COMP_WORDS[w]} == @(-*([^- ])[hC]*|--@(help|cleancache)) ]] && return 0 + _makepkg_deselect "$1" + done } -## makepkg completion - -_makepkg () -{ - local cur prev +# makepkg main +_makepkg() { COMPREPLY=() - cur=${COMP_WORDS[COMP_CWORD]} - prev=${COMP_WORDS[COMP_CWORD-1]} - case "$prev" in - -p) - _filedir - return 0 - ;; - --help|--cleancache) - COMPREPLY='' - return 0 - ;; - esac - - if [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '\ - -A --ignorearch \ - -b --builddeps \ - -c --clean \ - -C --cleancache \ - -d --nodeps \ - -e --noextract \ - -f --force \ - -g --geninteg \ - -h --help \ - -i --install \ - -L --log \ - -m --nocolor \ - -o --nobuild \ - -p \ - -r --rmdeps \ - -s --syncdeps \ - --asroot \ - --source \ - --noconfirm \ - --noprogressbar' -- $cur ) ) + local prev cur short long parse glob + prev=${COMP_WORDS[COMP_CWORD-1]} + cur=`_get_cword` + + short=( A C L R c d e f g h i m o p r s ) + + long=( --allsource --asroot --clean --cleancache --config --force + --geninteg --help --holdver --ignorearch --install --log + --nobuild --nocolor --noconfirm --nodeps --noextract + --noprogressbar --repackage --rmdeps --skipinteg --source + --syncdeps ) + + if (( COMP_CWORD == 1 )) && [[ $cur != -[^-]* ]]; then + # First word check + COMPREPLY=($(compgen -W "$(echo "${short[@]/#/-}" "${long[@]}")" -- "$cur")) + elif [[ $prev == @(--config|-*([^- ])p*) ]]; then + # Complete filenames for selected options + _arch_rem_selected + return 0 + else + # Generate the list depending on current word + case $cur in + -+($(IFS='|'; echo "${short[*]}"))) + _makepkg_count_words s + COMPREPLY=($(compgen -W "$(echo "${short[@]/#/$cur}")" -- "$cur")) + ;; + -*) + # If $cur isn't a combination option, fall back to displaying + # long options only. These are the prime target for completion + _makepkg_count_words l + COMPREPLY=($(compgen -W "$(echo "${long[@]}")" -- "$cur")) + ;; + esac fi - - rem_selected } -complete -o default -F _makepkg makepkg -## pacman completion - -_instring () -{ - str="${1}" - shift 1 - for c in "${@}"; do - if [ $(/bin/expr index "${str}" "${c}") -gt 0 ]; then - return 0 - fi - done - return 1 +# pacman packages +_pacman_pkg() { + COMPREPLY=($(compgen -W "$(if [[ $2 ]]; then + command pacman -"$1" |\ + command sed 's, .*,,' |\ + command sort -u + else + command pacman -"$1" + fi)" -- "$cur" )) } -_pacman () -{ - local a arg toparse op mod cur +# pacman main +_pacman() { COMPREPLY=() - # This argument parsing is done so we can check for flag existance later - # right now it's a tad crappy, but does the job - for (( i=1; i < ${#COMP_WORDS[@]}-1; i++ )); do - a=${COMP_WORDS[i]} - arg="${a:0:2}" - toparse="${a:2}" + local prev cur query remove sync upgrade core common list w m o s=() + prev=${COMP_WORDS[COMP_CWORD-1]} + cur=`_get_cword` - case "${arg}" in - -@(U|R|S|Q|h|V)) - op="${arg/-}" - mod="${mod}${a:2}" - ;; - --) - arg="${a:2}" - case "${arg}" in - remove) op="R" ;; - upgrade) op="U" ;; - query) op="Q" ;; - sync) op="S" ;; - help) op="h" ;; - version) op="V" ;; - verbose) mod="${mod}v" ;; - root) mod="${mod}r" ;; - dbpath) mod="${mod}b" ;; - nodeps) mod="${mod}d" ;; - force) mod="${mod}f" ;; - groups) mod="${mod}g" ;; - info) mod="${mod}i" ;; - list) mod="${mod}l" ;; - print-uris) mod="${mod}p" ;; - search) mod="${mod}s" ;; - sysupgrade) mod="${mod}u" ;; - upgrades) mod="${mod}u" ;; - downloadonly) mod="${mod}w" ;; - refresh) mod="${mod}y" ;; - changelog) mod="${mod}c" ;; - deps) mod="${mod}d" ;; - explicit) mod="${mod}e" ;; - unrequired) mod="${mod}t" ;; - foreign) mod="${mod}m" ;; - owns) mod="${mod}o" ;; - file) mod="${mod}p" ;; - search) mod="${mod}s" ;; - upgrades) mod="${mod}u" ;; - cascade) mod="${mod}c" ;; - check) mod="${mod}k" ;; - dbonly) mod="${mod}k" ;; - nosave) mod="${mod}n" ;; - recursive) mod="${mod}s" ;; - unneeded) mod="${mod}u" ;; - esac ;; - *) toparse="${a}" ;; - esac + # These are split in a subshell with IFS=' '. No point in listing + # them by \n since compgen -W can't handle spaces or new lines in + # operands + query=( '--changelog --check --deps --explicit --file --foreign --groups --info + --list --owns --quiet --search --unrequired --upgrades' 'c e g i k l m o p q s t u' ) - arglen=$(( ${#toparse}-1 )) - for c in $(/bin/seq 0 "${arglen}"); do - arg=${toparse:$c:1} - [ "${arg}" != "-" ] && mod="${mod}${arg}" - done - done + remove=( '--cascade --dbonly --nodeps --nosave --recursive --unneeded' 'c k n s u' ) - cur=${COMP_WORDS[COMP_CWORD]} + sync=( '--asdeps --asexplicit --clean --downloadonly --force --groups --ignore --ignoregroup + --info --list --needed --nodeps --print-uris --quiet --refresh --search --sysupgrade' + 'c f g i l p q s u w y' ) - if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then - COMPREPLY=( $( compgen -W '\ - -h --help \ - -Q --query \ - -R --remove \ - -S --sync \ - -U --upgrade \ - -V --version \ - ' -- $cur ) ) - rem_selected - return 0 - fi + upgrade=( '--asdeps --asexplicit --force --nodeps' f ) - if [[ "$cur" == -* ]]; then - case "${op}" in - U) - COMPREPLY=( $( compgen -W '\ - --asdeps \ - --asexplicit \ - -d --nodeps \ - -f --force \ - -h --help \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - R) - COMPREPLY=( $( compgen -W '\ - -c --cascade \ - -d --nodeps \ - -h --help \ - -k --dbonly \ - -n --nosave \ - -s --recursive \ - -u --unneeded \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - S) - COMPREPLY=( $( compgen -W '\ - --asdeps \ - --asexplicit \ - -c --clean \ - -d --nodeps \ - -f --force \ - -g --groups \ - -h --help \ - -i --info \ - -l --list \ - -p --print-uris \ - -s --search \ - -u --sysupgrade \ - -w --downloadonly \ - -y --refresh \ - --needed \ - --ignore \ - --ignoregroup \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - Q) - COMPREPLY=( $( compgen -W '\ - -c --changelog \ - -d --deps \ - -e --explicit \ - -g --groups \ - -h --help \ - -i --info \ - -k --check \ - -l --list \ - -m --foreign \ - -o --owns \ - -p --file \ - -s --search \ - -t --unrequired \ - -u --upgrades \ - --config \ - --logfile \ - --noconfirm \ - --noprogressbar \ - --noscriptlet \ - -v --verbose \ - -r --root \ - -b --dbpath \ - --cachedir \ - ' -- $cur ) ) - return 0 - ;; - esac - rem_selected + common=( '--cachedir --config --dbpath --debug --help --logfile --noconfirm + --noprogressbar --noscriptlet --root --verbose' 'b d h r v' ) + + core=( --query --remove --sync --upgrade --version -Q -R -S -U -V ) + + if (( COMP_CWORD == 1 )) && [[ $cur != -[^-]* ]]; then + COMPREPLY=($(compgen -W "$(echo "${core[@]}") '--help' '-h'" -- "$cur")) + return 0 + elif [[ $prev == @(-*([^- ])[br]*|--@(config|logfile|root|dbpath|cachedir)) ]]; then + _arch_rem_selected + return 0 else - case "${op}" in - U) - COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) + # Main option check + for m in 'Q query' 'R remove' 'S sync' 'U upgrade' 'null'; do + if [[ $m == null ]]; then + # Go back to core if null + COMPREPLY=($(compgen -W "$(echo "${core[@]}")" -- "$cur")) return 0 - ;; - h|V) - COMPREPLY='' - return 0 - ;; - Q) - if _instring $mod g; then - _installed_groups - elif _instring $mod o; then - COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -- "$cur" ) ) - elif _instring $mod p; then - COMPREPLY=( $( compgen -d -- "$cur" ) \ - $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) - elif _instring $mod u; then - COMPREPLY='' + fi + # Break on match + [[ $COMP_LINE == @(* -*([^- ])${m% *}*|* --${m#* } *) ]] && break + done + fi + + # See if $cur is an operand before calling _pacman_pkg + case $cur in + + # Check if it's a combination option first + -"${m% *}"*) + # Generate the list from the option arrays. eval is being using on + # possible matches between query, remove, sync, upgrade and common + # arrays; completely sanitized input + eval "list=($(command sed 's,.*,\${&[1]},' <<<"${m#* }"; IFS=' '; echo ${common[1]}))" + # Parse previous arguments + for (( w=0; w<${#COMP_WORDS[@]}; w++)); do + if [[ ${COMP_WORDS[w]} == -*([^-])[hV]* ]]; then return 0 - else - _installed_pkgs fi - return 0 + for o in "${!list[@]}"; do + if [[ ${COMP_WORDS[w]} == -*([^-])*${list[o]}* ]]; then + unset 'list[o]' + fi + done + done + # Allow special double letters + case ${m% *} in + Q) [[ $cur == *([^i])i*([^i]) ]] && s+=(i) ;; + R) [[ $cur == *([^s])s*([^s]) ]] && s+=(s) ;; + S) [[ $cur == *([^c])c*([^c]) ]] && s+=(c) + [[ $cur == *([^u])u*([^u]) ]] && s+=(u) + [[ $cur == *([^y])y*([^y]) ]] && s+=(y) ;; + esac + list=("${list[@]/#/$cur}" "${s[@]/#/$cur}") + ;; + + # Use long array instead + -*) + eval "list=($(command sed 's,.*,\${&[0]},' <<<"${m#* }"; IFS=' '; echo ${common[0]}))" + for (( w=0; w<${#COMP_WORDS[@]}-1; w++)); do + if [[ ${COMP_WORDS[w]} == --@(help|version) ]]; then + return 0 + fi + for o in "${!list[@]}"; do + if [[ ${COMP_WORDS[w]} == ${list[o]} ]]; then + unset 'list[o]'; break + fi + done + done + ;; + + # The word isn't an operand; use pacman or _filedir + *) + case ${m% *} in + # The weak extglobs are due to a previous match already + # confirming validity + Q) + case $COMP_LINE in + @(* -*([^- ])g*|* --groups *)) _pacman_pkg Qgq sort ;; + @(* -*([^- ])o*|* --owns *)) ;; + @(* -*([^- ])p*|* --file *)) _filedir 'pkg.tar.gz' ;; + @(* -*([^- ])u*|* --upgrades *)) _pacman_pkg Quq ;; + *) _pacman_pkg Qq ;; + esac ;; - R) - _installed_pkgs - return 0 + R) + _pacman_pkg Qq ;; - S) - if _instring $mod l; then - _available_repos - else - _available_pkgs - fi - return 0 + S) + case $COMP_LINE in + @(* -*([^- ])l*|* --list *)) _pacman_pkg Sl sort ;; + @(* -*([^- ])g*|* --groups *)) _pacman_pkg Sg ;; + *) _pacman_pkg Slq ;; + esac ;; - esac - fi - - rem_selected + U) + _filedir 'pkg.tar.gz' + ;; + esac + _arch_rem_selected + return 0 + ;; + esac + COMPREPLY=($(compgen -W "$(echo "${list[@]}")" -- "$cur")) } -complete -o filenames -F _pacman pacman + +complete -F _makepkg -o default -o filenames -o plusdirs makepkg +complete -F _pacman -o default -o filenames -o plusdirs pacman -- 1.6.6

4 6

[pacman-dev] Release plans
by Andres P 08 May '10

08 May '10

On 05/05/10 at 18:31:22 CEST, Dan McGee <dpmcgee at gmail.com> wrote: >>> 8*?) Tidy up bash_completion stuff? (FS#16630) > The poster disappeared and he tried to sneak a license change in > there, so that just hit a bit of a roadblock. I'd like to improve this > so I might just sit down and hack at it myself. "Tried to sneak a license change"? >From your own ml: > On Tue, Jan 19, 2010 at 11:48 PM, Andres Perera <andres...(a)gmail.com> wrote: >> On Wed, Jan 20, 2010 at 1:07 AM, Dan McGee <dpmc...(a)gmail.com> wrote: >>> Is this strictly necessary? You are changing one piece of code in the >>> entire codebase to require v3 or later and as weird as it sounds, I am >>> not going to let that fly. I won't be merging this unless it is v2 or >>> you give some darn good reasons why we should move to v3. >> >> Not really necessary. You can change it to v2, or I can do that if it >> requires a commit from me. > > Nah that's good enough for me. I'll try to give this whole thing a > workout in the next day or two and see if I can come up with anything > else that we might want to tweak, however. > > -Dan http://www.mail-archive.com/pacman-dev@archlinux.org/msg04127.html Maybe I was a little harsh? Anyway, I don't care if you put a random bash script I wrote ages ago under GPL, Public Domain, BSD... lol, Andres P

2 1