From d25fc42c5e5a39f2f041d9a29e3a7afe6e746194 Mon Sep 17 00:00:00 2001 From: Stefano Capitani Date: Sun, 18 Mar 2018 19:03:15 +0100 Subject: [PATCH] Revert "Now it works as expected" --- lib/util-iso.sh | 6 +++--- lib/util.sh | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/util-iso.sh b/lib/util-iso.sh index ebafb70..b235217 100644 --- a/lib/util-iso.sh +++ b/lib/util-iso.sh @@ -260,9 +260,9 @@ gen_iso_fn(){ [[ ${initsys} == 'openrc' ]] && vars+=("${initsys}") vars+=("${dist_release}") vars+=("${target_branch}") - - ! [[ ${full_iso} ]] && vars+=("minimal") - + if ! ${full_iso}; then + vars+=("minimal") + fi vars+=("${target_arch}") for n in ${vars[@]};do name=${name:-}${name:+-}${n} diff --git a/lib/util.sh b/lib/util.sh index 54864ae..1881b82 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -379,7 +379,9 @@ load_profile_config(){ [[ -z ${smb_workgroup} ]] && smb_workgroup='' - [[ ${full_iso} != none ]] && extra='true' + if ${full_iso}; then + extra='true' + fi basic='true' [[ -z ${extra} ]] && extra='false'