| index : pacman | |
| Archlinux32 fork of pacman | gitolite user |
| summaryrefslogtreecommitdiff |
| -rw-r--r-- | contrib/PKGBUILD.vim | 2 | ||||
| -rw-r--r-- | contrib/README | 2 | ||||
| -rw-r--r-- | contrib/bacman.sh.in | 4 | ||||
| -rw-r--r-- | contrib/checkupdates.sh.in | 10 | ||||
| -rw-r--r-- | contrib/pacdiff.sh.in | 8 | ||||
| -rw-r--r-- | contrib/pacscripts.sh.in | 2 |
diff --git a/contrib/PKGBUILD.vim b/contrib/PKGBUILD.vim index cf264f93..35ca6bd9 100644 --- a/contrib/PKGBUILD.vim +++ b/contrib/PKGBUILD.vim @@ -211,7 +211,7 @@ hi def link pbValidSha512sums Number " options syn keyword pb_k_options options contained -syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|purge\|upx\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags\)/ contained +syn match pbOptions /\(no\)\?\(strip\|docs\|libtool\|emptydirs\|zipman\|purge\|upx\|optipng\|distcc\|color\|ccache\|check\|sign\|makeflags\|buildflags\)/ contained syn match pbOptionsNeg /\!/ contained syn match pbOptionsDeprec /no/ contained syn region pbOptionsGroup start=/^options=(/ end=/)/ contains=pb_k_options,pbOptions,pbOptionsNeg,pbOptionsDeprec,pbIllegalOption diff --git a/contrib/README b/contrib/README index bcb4b853..befd3c1d 100644 --- a/contrib/README +++ b/contrib/README @@ -16,7 +16,7 @@ sync databases (for safety on rolling release distributions). paccache - a flexible package cache cleaning utility that allows greater control over which packages are removed. -pacdiff - a simple pacnew/pacorig/pacsave updater for /etc/. +pacdiff - a simple pacnew/pacsave updater for /etc/. paclist - list all packages installed from a given repository. Useful for seeing which packages you may have installed from the testing repository, diff --git a/contrib/bacman.sh.in b/contrib/bacman.sh.in index 14919422..fcee6a0d 100644 --- a/contrib/bacman.sh.in +++ b/contrib/bacman.sh.in @@ -5,7 +5,7 @@ # stored into the pacman database and system files # # Copyright (c) 2008 locci <carlocci_at_gmail_dot_com> -# Copyright (c) 2008-2014 Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2008-2015 Pacman Development Team <pacman-dev@archlinux.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 @@ -49,7 +49,7 @@ usage() { version() { printf "%s %s\n" "$myname" "$myver" echo 'Copyright (C) 2008 locci <carlocci_at_gmail_dot_com>' - echo 'Copyright (C) 2008-2014 Pacman Development Team <pacman-dev@archlinux.org>' + echo 'Copyright (C) 2008-2015 Pacman Development Team <pacman-dev@archlinux.org>' } while [[ ! -z $1 ]]; do diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in index f4f36c09..e8a81986 100644 --- a/contrib/checkupdates.sh.in +++ b/contrib/checkupdates.sh.in @@ -21,6 +21,9 @@ declare -r myname='checkupdates' declare -r myver='@PACKAGE_VERSION@' +m4_include(../scripts/library/output_format.sh) +m4_include(../scripts/library/term_colors.sh) + if (( $# > 0 )); then echo "${myname} (pacman) v${myver}" echo @@ -32,6 +35,11 @@ if (( $# > 0 )); then exit 0 fi +if ! type -P fakeroot >/dev/null; then + error 'Cannot find the fakeroot binary.' + exit 1 +fi + if [[ -z $CHECKUPDATES_DB ]]; then CHECKUPDATES_DB="${TMPDIR:-/tmp}/checkup-db-${USER}/" fi @@ -44,7 +52,7 @@ eval $(awk -F' *= *' '$1 ~ /DBPath/ { print $1 "=" $2 }' @sysconfdir@/pacman.con mkdir -p "$CHECKUPDATES_DB" ln -s "${DBPath}/local" "$CHECKUPDATES_DB" &> /dev/null fakeroot pacman -Sy --dbpath "$CHECKUPDATES_DB" --logfile /dev/null &> /dev/null -pacman -Qqu --dbpath "$CHECKUPDATES_DB" 2> /dev/null | grep -v '\[.*\]' +pacman -Qu --dbpath "$CHECKUPDATES_DB" 2> /dev/null | grep -v '\[.*\]' exit 0 diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index ecb6ae29..90eb3cc2 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -1,8 +1,8 @@ #!/bin/bash -# pacdiff : a simple pacnew/pacorig/pacsave updater +# pacdiff : a simple pacnew/pacsave updater # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin@gmail.com> -# Copyright (c) 2013-2014 Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2013-2015 Pacman Development Team <pacman-dev@archlinux.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 @@ -35,7 +35,7 @@ usage() { cat <<EOF ${myname} (pacman) v${myver} -A simple program to merge or remove pacnew/pacorig/pacsave files. +A simple program to merge or remove pacnew/pacsave files. Usage: $myname [-l | -f | -p] [--nocolor] @@ -62,7 +62,7 @@ EOF version() { printf "%s %s\n" "$myname" "$myver" echo 'Copyright (C) 2007 Aaron Griffin <aaronmgriffin@gmail.com>' - echo 'Copyright (C) 2013-2014 Pacman Development Team <pacman-dev@archlinux.org>' + echo 'Copyright (C) 2013-2015 Pacman Development Team <pacman-dev@archlinux.org>' } print_existing() { diff --git a/contrib/pacscripts.sh.in b/contrib/pacscripts.sh.in index f1bf8227..931d3610 100644 --- a/contrib/pacscripts.sh.in +++ b/contrib/pacscripts.sh.in @@ -5,7 +5,7 @@ # # Copyright (c) 2009 Giulio "giulivo" Fidente <giulivo.navigante@gmail.com> # Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com> -# Copyright (c) 2009-2014 Pacman Development Team <pacman-dev@archlinux.org> +# Copyright (c) 2009-2015 Pacman Development Team <pacman-dev@archlinux.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 |