From e4fdd3830481773b70bb7602af02ff06d8b0c843 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 27 Sep 2015 18:51:58 +0200 Subject: [PATCH] xbps-src/doinstall: touch install state file after running post-install too. --- common/xbps-src/libexec/xbps-src-doinstall.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/xbps-src/libexec/xbps-src-doinstall.sh b/common/xbps-src/libexec/xbps-src-doinstall.sh index 6a96dc62f4..a95d2e8ab7 100755 --- a/common/xbps-src/libexec/xbps-src-doinstall.sh +++ b/common/xbps-src/libexec/xbps-src-doinstall.sh @@ -37,6 +37,7 @@ if [ "$SUBPKG_MODE" = "no" ]; then if [ ! -f $XBPS_INSTALL_DONE ] || [ -f $XBPS_INSTALL_DONE -a -n "$XBPS_BUILD_FORCEMODE" ]; then mkdir -p $XBPS_DESTDIR/$XBPS_CROSS_TRIPLET/$pkgname-$version + # Run pre-install hooks run_pkg_hooks pre-install # Run pre_install() @@ -56,14 +57,14 @@ if [ "$SUBPKG_MODE" = "no" ]; then . $XBPS_BUILDSTYLEDIR/${build_style}.sh run_func do_install fi - touch -f $XBPS_INSTALL_DONE - # Run post_install() cd "$wrksrc" [ -n "$build_wrksrc" ] && cd $build_wrksrc if declare -f post_install >/dev/null; then run_func post_install fi + + touch -f $XBPS_INSTALL_DONE fi exit 0 fi