From 46340c8a878d4a45eb3296c9a47f8d43110d7d78 Mon Sep 17 00:00:00 2001 From: Adam Dickmeiss Date: Tue, 16 Jul 2013 14:35:17 +0200 Subject: [PATCH] id-pbuild.sh: clear distro list if distro option is given In other words, distros in IDMETA are NOT used when any of the options --debian,--squeeze,--centos is used. --- id-deb-build/id-pbuild.sh | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh index 78a9d5d..061661c 100755 --- a/id-deb-build/id-pbuild.sh +++ b/id-deb-build/id-pbuild.sh @@ -32,16 +32,15 @@ while test $# -gt 0; do -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; *) optarg= ;; esac - case $1 in --debian=*) - DEBIAN_DIST=$optarg + DEBIAN_DIST_A=$optarg ;; --ubuntu=*) - UBUNTU_DIST=$optarg + UBUNTU_DIST_A=$optarg ;; --centos=*) - CENTOS_DIST=$optarg + CENTOS_DIST_A=$optarg ;; --upload) upload=true @@ -55,9 +54,14 @@ while test $# -gt 0; do -*) do_help=yes ;; - esac + esac shift done +if test $DEBIAN_DIST_A -o $UBUNTU_DIST_A -o $CENTOS_DIST_A; then + DEBIAN_DIST=$DEBIAN_DIST_A + UBUNTU_DIST=$UBUNTU_DIST_A + CENTOS_DIST=$CENTOS_DIST_A +fi if test "$do_help" = "yes"; then usage 1 1>&2 -- 1.7.10.4