From 823891292e25e9e67fa6ad31ecebec237cdf10c5 Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 12 Apr 2013 18:29:51 +0000 Subject: [PATCH] Fix path --- pacman/PKGBUILD | 4 ++-- pacman/pacman.install | 28 ++++++++++++++++++---------- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/pacman/PKGBUILD b/pacman/PKGBUILD index 5a970c570..cd14a2f0a 100644 --- a/pacman/PKGBUILD +++ b/pacman/PKGBUILD @@ -5,7 +5,7 @@ pkgname=pacman pkgver=4.1.0 -pkgrel=2 +pkgrel=3 pkgdesc="A library-based package manager with dependency support" arch=('x86_64') url="http://www.archlinux.org/pacman/" @@ -35,7 +35,7 @@ build() { ./configure --prefix=/usr --sysconfdir=/etc \ --localstatedir=/var --enable-doc \ - --with-scriptlet-shell=/usr/bin/bash \ + --with-scriptlet-shell=/bin/bash \ --with-ldconfig=/usr/bin/ldconfig make make -C contrib diff --git a/pacman/pacman.install b/pacman/pacman.install index 599cdc8f4..0e598bb4b 100644 --- a/pacman/pacman.install +++ b/pacman/pacman.install @@ -1,21 +1,29 @@ #!/bin/sh -# tputcolors # arg 1: the new package version # arg 2: the old package version post_upgrade() { - # one time stuff for md5sum issue with older pacman versions - if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then - _resetbackups - fi + # one time stuff for md5sum issue with older pacman versions + if [ "$(vercmp $2 3.0.2)" -lt 0 ]; then + _resetbackups + fi + if [ "$(vercmp $2 3.5.0)" -lt 0 ]; then + _warnupgrade + fi +} + +_warnupgrade() { + echo ">>> The pacman database format has changed as of pacman 3.5.0." + echo ">>> You will need to run \`pacman-db-upgrade\` as root." + echo ">>>" } _resetbackups() { - echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" - echo ">>> you are able to remove all NoUpgrade lines of already protected" - echo ">>> files from pacman.conf." - echo ">>>" + echo ">>> Performing one-time reset of NoUpgrade md5sums. After this reset" + echo ">>> you are able to remove all NoUpgrade lines of already protected" + echo ">>> files from pacman.conf." + echo ">>>" - # path variables + # path variables pacconf="/etc/pacman.conf" dbpath="/var/lib/pacman/local" -- GitLab