From 906c59aee8b1f20d8e10b363b2ed5c59f9cc967e Mon Sep 17 00:00:00 2001 From: Thomas von Dein Date: Sun, 13 Dec 2020 14:54:16 +0100 Subject: [PATCH] fix version conflict --- jaildk | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jaildk b/jaildk index df67d2e..954a926 100755 --- a/jaildk +++ b/jaildk @@ -186,12 +186,12 @@ jaildk_build() { shift base='' - version='' + VERSION='' while getopts "b:v:" arg; do case $arg in b) base=${OPTARG};; - v) version=${OPTARG};; + v) VERSION=${OPTARG};; *) usage_build;; esac done @@ -204,10 +204,15 @@ jaildk_build() { mode=start fi - die_if_not_exist $jail $version + die_if_not_exist $jail $VERSION load-jail-config $jail + if test -n "$VERSION"; then + # overridden with -v + version=$VERSION + fi + if test -n "$buildbase"; then base="$buildbase" elif test -z "$base"; then