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

util-iso-cal: make yaml file name a get function

Browse source
This commit is contained in:
udeved 2016-08-20 22:56:27 +02:00
parent 1a8aa352a5
commit 09cf136d78
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
lib/util-iso-calamares.sh
View file

@ -294,17 +294,24 @@ write_postcfg_conf(){
echo " - manjaro" >> "$conf" echo " - manjaro" >> "$conf"
} }
write_netinstall_conf(){ get_yaml(){
local conf="$1/etc/calamares/modules/netinstall.conf" local args=() ext="yaml" yaml
if ${unpackfs};then if ${unpackfs};then
local yaml="netinstall-hybrid.yaml" args+=("hybrid")
[[ ${initsys} == 'openrc' ]] && yaml="netinstall-hybrid-${initsys}.yaml"
else else
local yaml="netinstall.yaml" args+=('netinstall')
[[ ${initsys} == 'openrc' ]] && yaml="netinstall-${initsys}.yaml"
fi fi
[[ ${initsys} == 'openrc' ]] && args+=("${initsys}")
[[ ${edition} == 'sonar' ]] && args+=("${edition}")
for arg in ${args[@]};do
yaml=${yaml:-}${yaml:+-}${arg}
done
echo "${yaml}.${ext}"
}
write_netinstall_conf(){
echo "---" > "$conf" echo "---" > "$conf"
echo "groupsUrl: ${netgroups}/${yaml}" >> "$conf" echo "groupsUrl: ${netgroups}/$(get_yaml)" >> "$conf"
} }
write_grubcfg_conf(){ write_grubcfg_conf(){