From f08ae09b5228d07ca7a593b21629fce7b2aee789 Mon Sep 17 00:00:00 2001 From: Pierre Pronchery Date: Tue, 2 Jun 2015 20:38:01 +0200 Subject: [PATCH] Let the package name be overridden --- src/deforaos-package.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/deforaos-package.sh b/src/deforaos-package.sh index 59b512f..fc20254 100755 --- a/src/deforaos-package.sh +++ b/src/deforaos-package.sh @@ -234,23 +234,20 @@ _package_guess_method() _package_guess_name() { - PACKAGE= - VERSION= - while read line; do case "$line" in "package="*) - PACKAGE="${line#package=}" + [ -n "$PACKAGE" ] || PACKAGE="${line#package=}" ;; "version="*) - VERSION="${line#version=}" + [ -n "$VERSION" ] || VERSION="${line#version=}" ;; "["*) break ;; esac done < "$PROJECTCONF" - [ -z "$PACKAGE" -o -z "$VERSION" ] && return 2 + [ -n "$PACKAGE" -a -n "$VERSION" ] || return 2 return 0 }