diff --git a/lib/util.sh b/lib/util.sh index 96f7ea5..0fca8cb 100644 --- a/lib/util.sh +++ b/lib/util.sh @@ -389,9 +389,9 @@ init_buildiso(){ init_deployiso(){ - [[ -z ${remote_target} ]] && remote_target="${dist_release}" + [[ -z ${remote_target} ]] && remote_target="/home/frs/project" - [[ -z ${remote_project} ]] && remote_project="manjaro" + [[ -z ${remote_project} ]] && remote_project="manjaro-testing" [[ -z ${remote_user} ]] && remote_user="Please set your user!" @@ -511,6 +511,34 @@ load_sets(){ echo $prof } +load_set(){ + local profs + for item in $(cat ${sets_dir_iso}/$1.set);do + profs=${profs:-}${profs:+|}${item} + done + echo $profs +} + +eval_edition(){ + eval "case $1 in + $(load_set 'official')) + iso_edition='official' + ;; + $(load_set 'community')) + iso_edition='community' + ;; + $(load_set 'official-minimal')) + iso_edition='official-minimal' + ;; + $(load_set 'community-minimal')) + iso_edition='community-minimal' + ;; + $(load_set 'community-openrc')) + iso_edition='community-openrc' + ;; + esac" +} + # $1: buildset # $2: sets_dir eval_buildset(){