makepkg: always run tidy_install on repackaging

When using "makepkg -R" without a packge function, we should still
run tidy_install as the user might have added other packaging options
such as (e.g.) '!emptydir' to remove empty directories on repackaging.
Of course we can not revert some options when repackaging without a
package function.

Signed-off-by: Allan McRae <allan@archlinux.org>

1 files changed, 3 insertions, 8 deletions

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 6f4732f9..d4d435f0 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -2687,7 +2687,6 @@ if (( INFAKEROOT )); then
 				if (( BUILDFUNC )); then
 					run_build
 					(( CHECKFUNC )) && run_check
-					tidy_install
 				fi
 			else
 				warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()"
@@ -2695,8 +2694,8 @@ if (( INFAKEROOT )); then
 			fi
 		else
 			run_package
-			tidy_install
 		fi
+		tidy_install
 		create_package
 	else
 		run_split_packaging
@@ -2828,15 +2827,11 @@ else
 		if (( ! SPLITPKG )); then
 			if (( PKGFUNC )); then
 				run_package
-				tidy_install
-			else
-				if (( ! REPKG )); then
-					tidy_install
-				else
+			elif (( REPKG )); then
 					warning "$(gettext "Repackaging without the use of a %s function is deprecated.")" "package()"
 					plain "$(gettext "File permissions may not be preserved.")"
-				fi
 			fi
+			tidy_install
 			create_package
 		else
 			run_split_packaging