From 92aa9704979aa6b4488eae6b24ee9626ed01177c Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 26 Jul 2016 14:50:04 +0200 Subject: [PATCH] Report the packaging method guess on stdout --- src/deforaos-package.sh | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/deforaos-package.sh b/src/deforaos-package.sh index 325cb22..819f2eb 100755 --- a/src/deforaos-package.sh +++ b/src/deforaos-package.sh @@ -87,7 +87,7 @@ _deforaos_package() _error "Could not determine the package name or version" return $? fi - [ -n "$METHOD" ] || _package_guess_method + [ -n "$METHOD" ] || METHOD=$(_package_guess_method) [ -n "$LICENSE" ] || _package_guess_license _package_guess_dependencies [ -n "$EMAIL" ] || _package_guess_email @@ -217,19 +217,17 @@ _package_guess_license() _package_guess_method() { - #guess the packaging method - METHOD= - - #debian - [ -f "/etc/debian_version" ] && METHOD="debian" - - #pkgsrc - [ -d "/usr/pkg" ] && METHOD="pkgsrc" - - if [ -z "$METHOD" ]; then + if [ -f "/etc/debian_version" ]; then + #debian + echo "debian" + elif [ -d "/usr/pkg" ]; then + #pkgsrc + echo "pkgsrc" + else _error "Unsupported platform" return $? fi + return 0 } _package_guess_name()