summaryrefslogtreecommitdiffstats
path: root/contrib/pacscripts.sh.in
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2013-06-18 05:59:18 +0200
committerAllan McRae <allan@archlinux.org>2013-06-18 05:59:18 +0200
commit71328479f394e517ab7caeb168182c00b1704842 (patch)
tree4f353d84d31f051412b52b5f6fca29567c2cdb36 /contrib/pacscripts.sh.in
parentb7f8f5d26a373e72fa49a6376307ee79935a035d (diff)
parent5a0c659a16831e1d4c62698352135122cfbb87e4 (diff)
downloadpacman-71328479f394e517ab7caeb168182c00b1704842.tar.gz
pacman-71328479f394e517ab7caeb168182c00b1704842.tar.xz
Merge branch 'maint'
Diffstat (limited to 'contrib/pacscripts.sh.in')
-rw-r--r--contrib/pacscripts.sh.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/contrib/pacscripts.sh.in b/contrib/pacscripts.sh.in
index 84687145..62c4e35b 100644
--- a/contrib/pacscripts.sh.in
+++ b/contrib/pacscripts.sh.in
@@ -5,6 +5,7 @@
#
# Copyright (c) 2009 Giulio "giulivo" Fidente <giulivo.navigante@gmail.com>
# Copyright (c) 2009 Xavier Chantry <shiningxc@gmail.com>
+# Copyright (c) 2009-2013 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
@@ -91,7 +92,7 @@ print_db() {
}
print_pkg() {
- if ! bsdtar -xOf "$1" .INSTALL 2>/dev/null; then
+ if ! bsdtar -xqOf "$1" .INSTALL 2>/dev/null; then
error "Package $1 does not include any .INSTALL script"
return 1
fi
@@ -113,10 +114,10 @@ print_scriptlet() {
error "Package $1 not found"
return 1
fi
- url=$(spacman -Sdp $1 | tail -n1)
+ url=$(pacman -Sddp $1)
filename=$(basename $url)
if [ ! -f "$pac_cache/$filename" ]; then
- if ! spacman -Sdw --noconfirm $1 >&2; then
+ if ! spacman -Sddw --noconfirm $1 >&2; then
error "Failed to download $1"
return 1
fi