forked from mirrored-repos/manjaro-tools
buildiso: determine iso_name from dist_name setting
use get_shared_list() for Packages-Desktop
This commit is contained in:
parent
20a4f39f9d
commit
26c0ba95c7
3 changed files with 14 additions and 7 deletions
|
@ -41,17 +41,14 @@
|
||||||
# dist_name="Manjaro"
|
# dist_name="Manjaro"
|
||||||
|
|
||||||
# unset defaults to given value
|
# unset defaults to given value
|
||||||
# dist_release=15.09
|
# dist_release=15.12
|
||||||
|
|
||||||
# unset defaults to value sourced from /etc/lsb-release
|
# unset defaults to value sourced from /etc/lsb-release
|
||||||
# dist_codename="Bellatrix"
|
# dist_codename="Capella"
|
||||||
|
|
||||||
# unset defaults to given value
|
# unset defaults to given value
|
||||||
# dist_branding="MJRO"
|
# dist_branding="MJRO"
|
||||||
|
|
||||||
# unset defaults to given value
|
|
||||||
# iso_name=manjaro
|
|
||||||
|
|
||||||
# iso publisher
|
# iso publisher
|
||||||
# iso_publisher="Manjaro Linux <http://www.manjaro.org>"
|
# iso_publisher="Manjaro Linux <http://www.manjaro.org>"
|
||||||
|
|
||||||
|
|
|
@ -365,6 +365,15 @@ make_isomounts() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get_shared_list(){
|
||||||
|
local path
|
||||||
|
case ${edition} in
|
||||||
|
sonar|netrunner) path=${run_dir}/shared/${edition}/Packages-Desktop ;;
|
||||||
|
*) path=${run_dir}/shared/manjaro/Packages-Desktop ;;
|
||||||
|
esac
|
||||||
|
echo $path
|
||||||
|
}
|
||||||
|
|
||||||
# $1: file name
|
# $1: file name
|
||||||
load_pkgs(){
|
load_pkgs(){
|
||||||
msg3 "Loading Packages: [${1##*/}] ..."
|
msg3 "Loading Packages: [${1##*/}] ..."
|
||||||
|
@ -431,7 +440,7 @@ load_pkgs(){
|
||||||
local list
|
local list
|
||||||
|
|
||||||
if [[ $1 == "${packages_custom}" ]];then
|
if [[ $1 == "${packages_custom}" ]];then
|
||||||
sort -u ${run_dir}/shared/Packages-Desktop ${packages_custom} > ${work_dir}/pkgs_merged
|
sort -u $(get_shared_list) ${packages_custom} > ${work_dir}/pkgs_merged
|
||||||
list=${work_dir}/pkgs_merged
|
list=${work_dir}/pkgs_merged
|
||||||
else
|
else
|
||||||
list=$1
|
list=$1
|
||||||
|
|
|
@ -181,7 +181,8 @@ init_buildiso(){
|
||||||
|
|
||||||
[[ -z ${dist_name} ]] && dist_name="Manjaro"
|
[[ -z ${dist_name} ]] && dist_name="Manjaro"
|
||||||
|
|
||||||
[[ -z ${iso_name} ]] && iso_name="manjaro"
|
# [[ -z ${iso_name} ]] && iso_name="manjaro"
|
||||||
|
iso_name=${dist_name,,}
|
||||||
|
|
||||||
iso_label="${dist_branding}${dist_release//.}"
|
iso_label="${dist_branding}${dist_release//.}"
|
||||||
iso_label="${iso_label//_}" # relace all _
|
iso_label="${iso_label//_}" # relace all _
|
||||||
|
|
Loading…
Reference in a new issue