root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

Revert "Now it works as expected"

Browse source
This commit is contained in:
Stefano Capitani 2018-03-18 19:03:15 +01:00 committed by GitHub
parent 2612c97ed2
commit d25fc42c5e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/util-iso.sh
View file

@ -260,9 +260,9 @@ gen_iso_fn(){
[[ ${initsys} == 'openrc' ]] && vars+=("${initsys}") [[ ${initsys} == 'openrc' ]] && vars+=("${initsys}")
vars+=("${dist_release}") vars+=("${dist_release}")
vars+=("${target_branch}") vars+=("${target_branch}")
if ! ${full_iso}; then
! [[ ${full_iso} ]] && vars+=("minimal") vars+=("minimal")
fi
vars+=("${target_arch}") vars+=("${target_arch}")
for n in ${vars[@]};do for n in ${vars[@]};do
name=${name:-}${name:+-}${n} name=${name:-}${name:+-}${n}

4
lib/util.sh
View file

@ -379,7 +379,9 @@ load_profile_config(){
[[ -z ${smb_workgroup} ]] && smb_workgroup='' [[ -z ${smb_workgroup} ]] && smb_workgroup=''
[[ ${full_iso} != none ]] && extra='true' if ${full_iso}; then
extra='true'
fi
basic='true' basic='true'
[[ -z ${extra} ]] && extra='false' [[ -z ${extra} ]] && extra='false'