1
0
mirror of https://github.com/moparisthebest/pacman synced 2025-01-10 21:38:19 -05:00

Merge branch 'maint'

This commit is contained in:
Dan McGee 2008-02-02 13:39:50 -06:00
commit c492ca840c
3 changed files with 39 additions and 34 deletions

View File

@ -1,36 +1,37 @@
# This is a default template for a post-install scriptlet. You can # This is a default template for a post-install scriptlet.
# remove any functions you don't need (and this header). # Uncomment only required functions and remove any functions
# you don't need (and this header).
# arg 1: the new package version ## arg 1: the new package version
pre_install() { #pre_install() {
/bin/true # do something here
} #}
# arg 1: the new package version ## arg 1: the new package version
post_install() { #post_install() {
/bin/true # do something here
} #}
# arg 1: the new package version ## arg 1: the new package version
# arg 2: the old package version ## arg 2: the old package version
pre_upgrade() { #pre_upgrade() {
/bin/true # do something here
} #}
# arg 1: the new package version ## arg 1: the new package version
# arg 2: the old package version ## arg 2: the old package version
post_upgrade() { #post_upgrade() {
/bin/true # do something here
} #}
# arg 1: the old package version ## arg 1: the old package version
pre_remove() { #pre_remove() {
/bin/true # do something here
} #}
# arg 1: the old package version ## arg 1: the old package version
post_remove() { #post_remove() {
/bin/true # do something here
} #}
# vim:set ts=2 sw=2 et: # vim:set ts=2 sw=2 et:

View File

@ -754,7 +754,7 @@ tidy_install() {
if [ "$(check_option strip)" = "y" ]; then if [ "$(check_option strip)" = "y" ]; then
msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")" msg2 "$(gettext "Stripping debugging symbols from binaries and libraries...")"
for file in $(find {,usr/{,local/},opt/}{bin,lib,sbin} -type f 2>/dev/null || true); do for file in $(find {,usr/{,local/},opt/*/}{bin,lib,sbin} -type f 2>/dev/null || true); do
case "$(file -biz "$file")" in case "$(file -biz "$file")" in
*application/x-sharedlib*) # Libraries *application/x-sharedlib*) # Libraries
/usr/bin/strip --strip-debug "$file";; /usr/bin/strip --strip-debug "$file";;

View File

@ -116,11 +116,11 @@ if [ "$4" != "" ]; then
fi fi
opt_force="" opt_force=""
if [ ! -f "$option" ]; then
die "$(gettext "%s not found")" $option
fi
if [ "$action" = "upd" ]; then # INSERT / UPDATE if [ "$action" = "upd" ]; then # INSERT / UPDATE
if [ ! -f "$option" ]; then
die "$(gettext "%s not found")" $option
fi
unset pkgname pkgver pkgrel options unset pkgname pkgver pkgrel options
source $option || die "$(gettext "failed to parse %s")" $option source $option || die "$(gettext "failed to parse %s")" $option
@ -141,10 +141,14 @@ if [ "$action" = "upd" ]; then # INSERT / UPDATE
else # DELETE else # DELETE
fname="$(basename $option)" fname="$(basename $option)"
if [ "$fname" = "PKGBUILD" ]; then if [ "$fname" = "PKGBUILD" ]; then
if [ ! -f "$option" ]; then
die "$(gettext "%s not found")" $option
fi
unset pkgname pkgver pkgrel options unset pkgname pkgver pkgrel options
source $option source $option
else else
pkgname=$1 pkgname=$option
fi fi
repo-remove "$pkgdb" "$pkgname" repo-remove "$pkgdb" "$pkgname"