diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/.gitignore | 0 | ||||
| -rw-r--r-- | contrib/Makefile.am | 2 | ||||
| -rw-r--r-- | contrib/PKGBUILD.vim | 2 | ||||
| -rw-r--r-- | contrib/README | 4 | ||||
| -rw-r--r-- | contrib/bash_completion | 13 | ||||
| -rwxr-xr-x | contrib/gensync | 134 | ||||
| -rwxr-xr-x | contrib/updatesync | 137 | ||||
| -rw-r--r-- | contrib/zsh_completion | 13 |
8 files changed, 287 insertions, 18 deletions
diff --git a/contrib/.gitignore b/contrib/.gitignore deleted file mode 100644 index e69de29b..00000000 --- a/contrib/.gitignore +++ /dev/null diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 9f01e187..7654848f 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,9 +1,11 @@ EXTRA_DIST = \ PKGBUILD.vim \ bash_completion \ + gensync \ pacdiff \ pacsearch \ re-pacman \ + updatesync \ vimproject \ wget-xdelta.sh \ zsh_completion \ diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index 57e4cf0e..8f45ae44 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -151,7 +151,7 @@ hi def link pbValidSha1sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|ccache\|distcc\|makeflags\|force\)/ contained +syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|ccache\|distcc\|makeflags\|force\)/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption,shDoubleQuote,shSingleQuote diff --git a/contrib/README b/contrib/README index 7eb36aae..1a1b6a9c 100644 --- a/contrib/README +++ b/contrib/README @@ -24,3 +24,7 @@ vimprojects - a project file for the vim project plugin. wget-xdelta.sh - A download script for pacman which allows binary deltas generated with makepkg to be used instead of downloading full binary packages. This should cut download sizes for some package upgrades significantly. + +gensync, updatesync - The former repository management scripts that have since +been superseded by repo-add and repo-remove. They are here for posterity's +sake, and to show how repo-add and repo-remove can be wrapped in other scripts. diff --git a/contrib/bash_completion b/contrib/bash_completion index 77192858..11f021c8 100644 --- a/contrib/bash_completion +++ b/contrib/bash_completion @@ -146,14 +146,13 @@ _pacman () toparse="${a:2}" case "${arg}" in - -@(A|U|R|S|Q|h|V)) + -@(U|R|S|Q|h|V)) op="${arg/-}" mod="${mod}${a:2}" ;; --) arg="${a:2}" case "${arg}" in - add) op="A" ;; remove) op="R" ;; upgrade) op="U" ;; query) op="Q" ;; @@ -187,6 +186,7 @@ _pacman () dbonly) mod="${mod}k" ;; nosave) mod="${mod}n" ;; recursive) mod="${mod}s" ;; + unneeded) mod="${mod}u" ;; esac ;; *) toparse="${a}" ;; esac @@ -202,7 +202,6 @@ _pacman () if [ $COMP_CWORD -eq 1 ] && [[ "$cur" == -* ]]; then COMPREPLY=( $( compgen -W '\ - -A --add \ -h --help \ -Q --query \ -R --remove \ @@ -216,9 +215,10 @@ _pacman () if [[ "$cur" == -* ]]; then case "${op}" in - A|U) + U) COMPREPLY=( $( compgen -W '\ --asdeps \ + --asexplicit \ -d --nodeps \ -f --force \ -h --help \ @@ -242,6 +242,7 @@ _pacman () -k --dbonly \ -n --nosave \ -s --recursive \ + -u --unneeded \ --config \ --logfile \ --noconfirm \ @@ -257,9 +258,9 @@ _pacman () S) COMPREPLY=( $( compgen -W '\ --asdeps \ + --asexplicit \ -c --clean \ -d --nodeps \ - -e --dependsonly \ -f --force \ -g --groups \ -h --help \ @@ -316,7 +317,7 @@ _pacman () rem_selected else case "${op}" in - A|U) + U) COMPREPLY=( $( compgen -d -- "$cur" ) \ $( compgen -f -X '!*.pkg.tar.gz' -- "$cur" ) ) return 0 diff --git a/contrib/gensync b/contrib/gensync new file mode 100755 index 00000000..51d32ceb --- /dev/null +++ b/contrib/gensync @@ -0,0 +1,134 @@ +#!/bin/bash +# +# gensync +# +# Copyright (c) 2002-2007 by Judd Vinet <jvinet@zeroflux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +myver='3.1.1' + +# functions + +usage() { + printf "gensync (pacman) %s\n\n" "$myver" + printf "Usage: %s <root> <destfile> [package_directory]\n\n" "$0" + printf "\ +gensync will generate a sync database by reading all PKGBUILD files\n\ +from <root>. gensync builds the database in a temporary directory\n\ +and then compresses it to <destfile>.\n\n" + printf "\ +gensync will calculate md5sums of packages in the same directory as\n\ +<destfile>, unless an alternate [package_directory] is specified.\n\n" + printf "\ +note: The <destfile> name is important. It must be of the form\n\ + {treename}.db.tar.gz where {treename} is the name of the custom\n\ + package repository you configured in /etc/pacman.conf. The\n\ + generated database must reside in the same directory as your\n\ + custom packages (also configured in /etc/pacman.conf)\n\n" + echo "Example: gensync /var/abs/local /home/mypkgs/custom.db.tar.gz" +} + +version() { + printf "gensync (pacman) %s\n" "$myver" + printf "\ +Copyright (C) 2002-2007 Judd Vinet <jvinet@zeroflux.org>.\n\n\ +This is free software; see the source for copying conditions.\n\ +There is NO WARRANTY, to the extent permitted by law.\n" +} + +error () { + local mesg=$1; shift + printf "==> ERROR: ${mesg}\n" "$@" >&2 +} + +die () { + error $* + exit 1 +} + +# PROGRAM START + +if [ "$1" = "-h" -o "$1" = "--help" ]; then + usage + exit 0 +fi + +if [ "$1" = "-V" -o "$1" = "--version" ]; then + version + exit 0 +fi + +if [ $# -lt 2 ]; then + usage + exit 1 +fi + +# source system and user makepkg.conf +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + die "/etc/makepkg.conf not found. Cannot continue." +fi + +if [ -r ~/.makepkg.conf ]; then + source ~/.makepkg.conf +fi + + +d=$(dirname $1) +rootdir="$(cd $d && pwd)/$(basename $1)" +d="$(dirname $2)" +destdir="$(cd $d && pwd)" +destfile="$destdir/$(basename $2)" +pkgdir="" +if [ "$3" != "" ]; then + pkgdir="$3" +fi + +[ ! -d "$rootdir" ] && die "invalid root dir: $rootdir" + +echo "gensync: building database entries, generating md5sums..." >&2 +cd "$destdir" + +pkgs="" + +for file in $(find "$rootdir"/* -name "$BUILDSCRIPT"); do + unset pkgname pkgver pkgrel options + + source $file || die "failed to parse $file" + if [ "$arch" = 'any' ]; then + CARCH='any' + fi + if [ "$pkgdir" != "" ]; then + pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}" + else + pkgfile="$destdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}" + fi + + if [ ! -f "$pkgfile" ]; then + error "could not find %s-%s-%s-%s%s - skipping" $pkgname $pkgver $pkgrel $CARCH $PKGEXT + else + pkgs="$pkgs $pkgfile" + fi +done + +echo "creating repo DB..." + +# we'll trim the output just a tad, as gensync may be used on large repos +repo-add $destfile $pkgs \ + | grep -e "package" -e "database" + +# vim: set ts=2 sw=2 noet: diff --git a/contrib/updatesync b/contrib/updatesync new file mode 100755 index 00000000..f88e8237 --- /dev/null +++ b/contrib/updatesync @@ -0,0 +1,137 @@ +#!/bin/bash +# +# updatesync +# +# Copyright (c) 2004 by Jason Chu <jason@archlinux.org> +# Derived from gensync (c) 2002-2006 Judd Vinet <jvinet@zeroflux.org> +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# + +myver='3.1.1' + +# functions + +usage() { + printf "updatesync (pacman) %s\n\n" "$myver" + printf "Usage: %s <action> <destfile> <option> [package_directory]\n\n" "$0" + printf "\ +updatesync will update a sync database by reading a PKGBUILD and\n\ +modifying the destfile. updatesync updates the database in a temporary\n\ +directory and then compresses it to <destfile>.\n\n" + printf "There are two types of actions:\n\n" + printf "upd - Will update a package's entry or create it if it doesn't exist.\n It takes the package's PKGBUILD as an option.\n" + printf "del - Will remove a package's entry from the db. It takes the package's\n name as an option.\n" + echo + printf "\ +updatesync will calculate md5sums of packages in the same directory as\n\ +<destfile>, unless an alternate [package_directory] is specified.\n\n" + echo "Example: updatesync upd /home/mypkgs/custom.db.tar.gz PKGBUILD" +} + +version() { + printf "updatesync (pacman) %s\n" "$myver" + printf "\ +Copyright (C) 2004 Jason Chu <jason@archlinux.org>.\n\n\ +This is free software; see the source for copying conditions.\n\ +There is NO WARRANTY, to the extent permitted by law.\n" +} + +error () { + local mesg=$1; shift + printf "==> ERROR: ${mesg}\n" "$@" >&2 +} + +die () { + error $* + exit 1 +} + +# PROGRAM START + +if [ "$1" = "-h" -o "$1" = "--help" ]; then + usage + exit 0 +fi + +if [ "$1" = "-V" -o "$1" = "--version" ]; then + version + exit 0 +fi + +if [ $# -lt 3 ]; then + usage + exit 1 +fi + +# source system and user makepkg.conf +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + die "/etc/makepkg.conf not found. Cannot continue." +fi + +if [ -r ~/.makepkg.conf ]; then + source ~/.makepkg.conf +fi + +if [ "$1" != "upd" -a "$1" != "del" ]; then + usage + exit 1 +fi + +action=$1 +pkgdb=$2 +option=$3 +pkgdir="$(pwd)" +if [ "$4" != "" ]; then + pkgdir="$4" +fi + +if [ "$action" = "upd" ]; then # INSERT / UPDATE + if [ ! -f "$option" ]; then + die "$option not found" + fi + + unset pkgname pkgver pkgrel options + + source $option || die "failed to parse $option" + if [ "$arch" = 'any' ]; then + CARCH='any' + fi + pkgfile="$pkgdir/$pkgname-$pkgver-$pkgrel-${CARCH}${PKGEXT}" + + if [ ! -f "$pkgfile" ]; then + die "could not find %s-%s-%s-%s%s - aborting" $pkgname $pkgver $pkgrel $CARCH $PKGEXT + fi + + repo-add "$pkgdb" "$pkgfile" +else # DELETE + fname="$(basename $option)" + if [ "$fname" = "PKGBUILD" ]; then + if [ ! -f "$option" ]; then + die "%s not found" $option + fi + + unset pkgname pkgver pkgrel options + source $option + else + pkgname=$option + fi + + repo-remove "$pkgdb" "$pkgname" +fi + +exit 0 +# vim: set ts=2 sw=2 noet: diff --git a/contrib/zsh_completion b/contrib/zsh_completion index 8dec06df..e1273184 100644 --- a/contrib/zsh_completion +++ b/contrib/zsh_completion @@ -6,7 +6,6 @@ typeset -A opt_args # options for passing to _arguments: main pacman commands _pacman_opts_commands=( - '-A[Add a package to the system]' '-Q[Query the package database]' '-R[Remove a package from the system]' '-S[Synchronize packages]' @@ -29,7 +28,7 @@ _pacman_opts_common=( '--noscriptlet[Do not execute the install scriptlet if one exists]' ) -# options for passing to _arguments: options for --add and --update commands +# options for passing to _arguments: options for --upgrade commands _pacman_opts_pkgfile=( '-d[Skip dependency checks]' '-f[Overwrite conflicting files]' @@ -78,7 +77,6 @@ _pacman_opts_sync_actions=( # options for passing to _arguments: options for --sync command _pacman_opts_sync_modifiers=( '-d[Skip dependency checks]' - '-e[Install dependencies only]' '-f[Overwrite conflicting files]' '-i[View package information]' '-l[List all packages in a repository]' @@ -91,15 +89,9 @@ _pacman_opts_sync_modifiers=( '*--ignoregroup[Ignore a group upgrade]:package group: _pacman_completions_all_groups' '--asdeps[Install packages as non-explicitly installed]' + '--asexplicit[Install packages as explicitly installed]' ) -# handles --action subcommand -_pacman_action_add() { - _arguments -s : \ - "$_pacman_opts_common[@]" \ - "$_pacman_opts_pkgfile[@]" -} - # handles --help subcommand _pacman_action_help() { _arguments -s : \ @@ -290,7 +282,6 @@ _pacman_get_command() { # main dispatcher _pacman() { case $words[2] in - -A*) _pacman_action_add ;; -Q*g*) # ipkg groups _arguments -s : \ "$_pacman_opts_common[@]" \ |