From 6bbfdac7c2442ed72fd5c456ff46f1c615765ded Mon Sep 17 00:00:00 2001 From: Juan RP Date: Tue, 19 Jul 2011 22:36:17 +0200 Subject: [PATCH] xbps-src: make run_func() print a msg on success. --- xbps-src/libexec/doinst-helper.sh.in | 2 -- xbps-src/shutils/build_funcs.sh | 2 -- xbps-src/shutils/common_funcs.sh | 2 ++ xbps-src/shutils/configure_funcs.sh | 2 -- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/xbps-src/libexec/doinst-helper.sh.in b/xbps-src/libexec/doinst-helper.sh.in index c5c8af4f2e2..a6924747e82 100644 --- a/xbps-src/libexec/doinst-helper.sh.in +++ b/xbps-src/libexec/doinst-helper.sh.in @@ -63,7 +63,6 @@ install_src_phase() # Run pre_install func. if [ ! -f $XBPS_PRE_INSTALL_DONE ]; then run_func pre_install - msg_normal "$pkgver: pre_install (destdir) phase done.\n" touch -f $XBPS_PRE_INSTALL_DONE fi @@ -84,7 +83,6 @@ install_src_phase() # Run post_install func. if [ ! -f $XBPS_POST_INSTALL_DONE ]; then run_func post_install - msg_normal "$pkgver: post_install (destdir) phase done.\n" touch -f $XBPS_POST_INSTALL_DONE fi diff --git a/xbps-src/shutils/build_funcs.sh b/xbps-src/shutils/build_funcs.sh index c29be095425..954c1d8f0fd 100644 --- a/xbps-src/shutils/build_funcs.sh +++ b/xbps-src/shutils/build_funcs.sh @@ -65,7 +65,6 @@ build_src_phase() # Run pre_build func. if [ ! -f $XBPS_PRE_BUILD_DONE ]; then run_func pre_build - msg_normal "$pkgver: pre_build phase done.\n" touch -f $XBPS_PRE_BUILD_DONE fi @@ -80,7 +79,6 @@ build_src_phase() # Run post_build func. if [ ! -f $XBPS_POST_BUILD_DONE ]; then run_func post_build - msg_normal "$pkgver: post_build phase done.\n" touch -f $XBPS_POST_BUILD_DONE fi diff --git a/xbps-src/shutils/common_funcs.sh b/xbps-src/shutils/common_funcs.sh index 5d4043fdcfe..308ee90cb5c 100644 --- a/xbps-src/shutils/common_funcs.sh +++ b/xbps-src/shutils/common_funcs.sh @@ -108,6 +108,8 @@ run_func() rm -f "$logpipe" if [ $rval -ne 0 ]; then msg_error "$pkgver: $func failed!\n" + else + msg_normal "$pkgver: $func phase done.\n" fi fi return 255 # function not found. diff --git a/xbps-src/shutils/configure_funcs.sh b/xbps-src/shutils/configure_funcs.sh index 80172d6fad6..5c923ddec75 100644 --- a/xbps-src/shutils/configure_funcs.sh +++ b/xbps-src/shutils/configure_funcs.sh @@ -79,7 +79,6 @@ configure_src_phase() # Run pre_configure func. if [ ! -f $XBPS_PRECONFIGURE_DONE ]; then run_func pre_configure - msg_normal "$pkgver: pre_configure phase done.\n" touch -f $XBPS_PRECONFIGURE_DONE fi @@ -110,7 +109,6 @@ configure_src_phase() # Run post_configure func. if [ ! -f $XBPS_POSTCONFIGURE_DONE ]; then run_func post_configure - msg_normal "$pkgver: post_configure phase done.\n" touch -f $XBPS_POSTCONFIGURE_DONE fi