From b64dd4dfeabf15731dadede6f4b0ebab7637a90e Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Mon, 16 Sep 2019 23:04:34 +0200 Subject: [PATCH] Omit branch in iso-filename if branch is stable Fix variable brackets --- lib/util-iso.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index bda7066..c435ee3 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -221,12 +221,14 @@ gen_iso_fn(){ [[ -n ${profile} ]] && vars+=("${profile}") fi vars+=("${dist_release}") - vars+=("${target_branch}") + if [[ ! ${target_branch} == "stable" ]]; then + vars+=("${target_branch}") + fi [[ ${extra} == 'false' ]] && vars+=("minimal") vars+=("$(date +%y%m%d)") - vars+=("$(kernel)") + vars+=("${kernel}") vars+=("${target_arch}") for n in ${vars[@]}; do name=${name:-}${name:+-}${n}