From 288425875e5386289be242e47a15dd876ee58c4a Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 18 Jul 2011 16:41:56 +0200 Subject: [PATCH] xbps-src: minor cosmetic changes to doinst-helper. --- xbps-src/libexec/doinst-helper.sh.in | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/xbps-src/libexec/doinst-helper.sh.in b/xbps-src/libexec/doinst-helper.sh.in index 00aa136631..c5c8af4f2e 100644 --- a/xbps-src/libexec/doinst-helper.sh.in +++ b/xbps-src/libexec/doinst-helper.sh.in @@ -36,7 +36,7 @@ fi set_defvars -for f in $(echo $XBPS_SHUTILSDIR/*.sh); do +for f in $XBPS_SHUTILSDIR/*.sh; do [ -r "$f" ] && . $f done @@ -45,7 +45,6 @@ install_src_phase() local f i subpkg spkgrev [ -z $pkgname ] && return 2 - # # There's nothing we can do if we are a meta template. # Just creating the dir is enough to write the package metadata. @@ -69,14 +68,15 @@ install_src_phase() fi # Type of installation: custom, make or python. - case "$build_style" in - custom-install) run_func do_install;; - python-module) + if [ "$build_style" = "custom-install" ]; then + run_func do_install + elif [ "$build_style" = "python-module" ]; then . $XBPS_HELPERSDIR/python-module.sh run_func do_install - ;; - *) run_func make_install;; - esac + else + run_func make_install + fi + cd ${wrksrc} || msg_error "can't change cwd to wrksrc!\n" msg_normal "$pkgver: install (destdir) phase done.\n"