buildiso: determine iso_name from dist_name setting

use get_shared_list() for Packages-Desktop

data/manjaro-tools.conf

@@ -41,17 +41,14 @@
 # dist_name="Manjaro"
 
 # unset defaults to given value
-# dist_release=15.09
+# dist_release=15.12
 
 # unset defaults to value sourced from /etc/lsb-release
-# dist_codename="Bellatrix"
+# dist_codename="Capella"
 
 # unset defaults to given value
 # dist_branding="MJRO"
 
-# unset defaults to given value
-# iso_name=manjaro
-
 # iso publisher
 # iso_publisher="Manjaro Linux <http://www.manjaro.org>"
 

lib/util-iso.sh

@@ -365,6 +365,15 @@ make_isomounts() {
 	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
 load_pkgs(){
 	msg3 "Loading Packages: [${1##*/}] ..."
@@ -431,7 +440,7 @@ load_pkgs(){
 	local list
 
 	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
 	else
 		list=$1

lib/util.sh

@@ -181,7 +181,8 @@ init_buildiso(){
 
 	[[ -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="${iso_label//_}"	# relace all _