adapt for new meta-packages schema

1 files changed, 45 insertions, 46 deletions

diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index dff773a..ca5d19a 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -125,63 +125,62 @@ make_basefs() {
 
 # Additional packages (root-image)
 make_packages() {
-    local _packages_msg="standard packages as declared in the following files:"
-    local _gui_packages_msg="non-graphical packages as declared in the following files:"
+    local _base_packages_msg="standard packages as declared in the following files:"
+    local _extra_packages_msg="non-graphical packages as declared in the following files:"
     # standard package lists
-    local _install_base_lists=$(   ls ${packages_dir}/packages-{all,${iso_init}}.{all,${arch}} 2> /dev/null || true)
-    local _cache_base_lists=$(     ls ${packages_dir}/cache-{all,${iso_init}}.{all,${arch}}    2> /dev/null || true)
-    # standard gui package lists
-    local _install_basegui_lists=$(ls ${packages_dir}/packages-gui.{all,${arch}}               2> /dev/null || true)
-    local _cache_basegui_lists=$(  ls ${packages_dir}/cache-gui.{all,${arch}}                  2> /dev/null || true)
-    # init-specific gui package lists
-    local _install_initgui_lists=$(ls ${packages_dir}/packages-${iso_init}-gui.{all,${arch}}   2> /dev/null || true)
-    local _cache_initgui_lists=$(  ls ${packages_dir}/cache-${iso_init}-gui.{all,${arch}}      2> /dev/null || true)
-    # wmde-specific package lists
-    local _install_gui_lists=$(    ls ${packages_dir}/packages-${iso_wmde}.{all,${arch}}       2> /dev/null || true)
-    local _cache_gui_lists=$(      ls ${packages_dir}/cache-${iso_wmde}.{all,${arch}}          2> /dev/null || true)
+    local _install_base_lists=$( ls ${packages_dir}/packages-{all,${iso_init}}.{all,${arch}} 2> /dev/null || true)
+    local _cache_base_lists=$(   ls ${packages_dir}/cache-{all,${iso_init}}.{all,${arch}}    2> /dev/null || true)
+    # extra package lists
+    local _install_extra_lists=$(ls ${packages_dir}/packages-gui.{all,${arch}}               2> /dev/null || true)
+    local _cache_extra_lists=$(  ls ${packages_dir}/cache-gui.{all,${arch}}                  2> /dev/null || true)
+    # init-specific extra package lists
+    local _install_init_lists=$( ls ${packages_dir}/packages-${iso_init}-gui.{all,${arch}}   2> /dev/null || true)
+    local _cache_init_lists=$(   ls ${packages_dir}/cache-${iso_init}-gui.{all,${arch}}      2> /dev/null || true)
+    # wmde-specific extra package lists
+    local _install_wmde_lists=$( ls ${packages_dir}/packages-${iso_wmde}.{all,${arch}}       2> /dev/null || true)
+    local _cache_wmde_lists=$(   ls ${packages_dir}/cache-${iso_wmde}.{all,${arch}}          2> /dev/null || true)
     _install_base_lists=${_install_base_lists// /}
     _cache_base_lists=${_cache_base_lists// /}
-    _install_basegui_lists=${_install_basegui_lists// /}
-    _cache_basegui_lists=${_cache_basegui_lists// /}
-    _install_initgui_lists=${_install_initgui_lists// /}
-    _cache_initgui_lists=${_cache_initgui_lists// /}
-    _install_gui_lists=${_install_gui_lists// /}
-    _cache_gui_lists=${_cache_gui_lists// /}
+    _install_extra_lists=${_install_extra_lists// /}
+    _cache_extra_lists=${_cache_extra_lists// /}
+    _install_init_lists=${_install_init_lists// /}
+    _cache_init_lists=${_cache_init_lists// /}
+    _install_wmde_lists=${_install_wmde_lists// /}
+    _cache_wmde_lists=${_cache_wmde_lists// /}
     # collect standard packages
-    local _install_base_packages=$(   [ "${_install_base_lists}"    ] && grep -hv ^# ${_install_base_lists})
-    local _cache_base_packages=$(     [ "${_cache_base_lists}"      ] && grep -hv ^# ${_cache_base_lists})
-    # collect standard gui packages
-    local _install_basegui_packages=$([ "${_install_basegui_lists}" ] && grep -hv ^# ${_install_basegui_lists})
-    local _cache_basegui_packages=$(  [ "${_cache_basegui_lists}"   ] && grep -hv ^# ${_cache_basegui_lists})
-    # collect init-specific gui packages
-    local _install_initgui_packages=$([ "${_install_initgui_lists}" ] && grep -hv ^# ${_install_initgui_lists})
-    local _cache_initgui_packages=$(  [ "${_cache_initgui_lists}"   ] && grep -hv ^# ${_cache_initgui_lists})
-    # collect wmde-specific packages
-    local _install_gui_packages=$(    [ "${_install_gui_lists}"     ] && grep -hv ^# ${_install_gui_lists})
-    local _cache_gui_packages=$(      [ "${_cache_gui_lists}"       ] && grep -hv ^# ${_cache_gui_lists})
-    if [[ "${iso_wmde}" != 'cli' ]]; then
-        _gui_packages_msg="${_gui_packages_msg/non-graphical/graphical}"
-        _install_gui_lists="${_install_basegui_lists} ${_install_initgui_lists} ${_install_gui_lists}"
-        _cache_gui_lists="${_cache_basegui_lists} ${_cache_initgui_lists} ${_cache_gui_lists}"
-        _install_gui_packages="${_install_basegui_packages} ${_install_initgui_packages} ${_install_gui_packages}"
-        _cache_gui_packages="${_cache_basegui_packages} ${_cache_initgui_packages} ${_cache_gui_packages}"
+    local _install_base_packages=$(   [ "${_install_base_lists}"  ] && grep -hv ^# ${_install_base_lists})
+    local _cache_base_packages=$(     [ "${_cache_base_lists}"    ] && grep -hv ^# ${_cache_base_lists})
+    # collect extra packages
+    local _install_basegui_packages=$([ "${_install_extra_lists}" ] && grep -hv ^# ${_install_extra_lists})
+    local _cache_basegui_packages=$(  [ "${_cache_extra_lists}"   ] && grep -hv ^# ${_cache_extra_lists})
+    # collect init-specific extra packages
+    local _install_init_packages=$(   [ "${_install_init_lists}"  ] && grep -hv ^# ${_install_init_lists})
+    local _cache_init_packages=$(     [ "${_cache_init_lists}"    ] && grep -hv ^# ${_cache_init_lists})
+    # collect wmde-specific extra packages
+    local _install_wmde_packages=$(   [ "${_install_wmde_lists}"  ] && grep -hv ^# ${_install_wmde_lists})
+    local _cache_wmde_packages=$(     [ "${_cache_wmde_lists}"    ] && grep -hv ^# ${_cache_wmde_lists})
+    if [[ "${iso_wmde}" != 'cli' && "${iso_wmde}" != 'mini' ]]; then
+        _install_wmde_lists="${_install_extra_lists} ${_install_init_lists} ${_install_wmde_lists}"
+        _cache_wmde_lists="${_cache_extra_lists} ${_cache_init_lists} ${_cache_wmde_lists}"
+        _install_wmde_packages="${_install_basegui_packages} ${_install_init_packages} ${_install_wmde_packages}"
+        _cache_wmde_packages="${_cache_basegui_packages} ${_cache_init_packages} ${_cache_wmde_packages}"
     fi
-    _install_gui_lists=${_install_gui_lists// /}
-    _cache_gui_lists=${_cache_gui_lists// /}
+    _install_wmde_lists=${_install_wmde_lists// /}
+    _cache_wmde_lists=${_cache_wmde_lists// /}
     _install_base_packages=${_install_base_packages// /}
     _cache_base_packages=${_cache_base_packages// /}
-    _install_gui_packages=${_install_gui_packages// /}
-    _cache_gui_packages=${_cache_gui_packages// /}
+    _install_wmde_packages=${_install_wmde_packages// /}
+    _cache_wmde_packages=${_cache_wmde_packages// /}
 
     # display results
-    local _install_packages="${_install_base_packages} ${_install_gui_packages}"
-    local _cache_packages="${_cache_base_packages} ${_cache_gui_packages}"
+    local _install_packages="${_install_base_packages} ${_install_wmde_packages}"
+    local _cache_packages="${_cache_base_packages} ${_cache_wmde_packages}"
     _install_packages=${_install_packages// /}
     _cache_packages=${_cache_packages// /}
-    [ "${_install_base_packages}" ] && echo "Installing ${_packages_msg}"     && echo "${_install_base_lists}" | sed "s/.*\//\t/"
-    [ "${_cache_base_packages}"   ] && echo "Caching ${_packages_msg}"        && echo "${_cache_base_lists}"   | sed "s/.*\//\t/"
-    [ "${_install_gui_packages}"  ] && echo "Installing ${_gui_packages_msg}" && echo "${_install_gui_lists}"  | sed "s/.*\//\t/"
-    [ "${_cache_gui_packages}"    ] && echo "Caching ${_gui_packages_msg}"    && echo "${_cache_gui_lists}"    | sed "s/.*\//\t/"
+    [ "${_install_base_packages}" ] && echo "Installing ${_base_packages_msg}"  && echo "${_install_base_lists}"  | sed "s/.*\//\t/"
+    [ "${_cache_base_packages}"   ] && echo "Caching ${_base_packages_msg}"     && echo "${_cache_base_lists}"    | sed "s/.*\//\t/"
+    [ "${_install_wmde_packages}" ] && echo "Installing ${_extra_packages_msg}" && echo "${_install_wmde_lists}"  | sed "s/.*\//\t/"
+    [ "${_cache_wmde_packages}"   ] && echo "Caching ${_extra_packages_msg}"    && echo "${_cache_wmde_lists}"    | sed "s/.*\//\t/"
 
     # install packages
     setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${iso_dirname} -p "${_install_packages}" install