Merge branch 'maint'

proto.install

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

scripts/makepkg.sh.in

@@ -754,7 +754,7 @@ tidy_install() {
 
 	if [ "$(check_option strip)" = "y" ]; then
 		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
 				*application/x-sharedlib*)  # Libraries
 					/usr/bin/strip --strip-debug "$file";;

scripts/updatesync.sh.in

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