skip task if config list not defined

bin/customize/apps/atom

@@ -20,6 +20,11 @@ _install-packages() {
     local cfg_file="${2:?Config file missing}"
     local package
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" atom-packages; then
+        return 0
+    fi
+
     print-header Install Atom packages "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for package in $(cfg-read "${cfg_file}" atom-packages); do

bin/customize/gnome/user-dirs

@@ -21,6 +21,11 @@ _copy-bookmarks() {
     local cfg_file="${2:?Config file missing}"
     local line
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" bookmarks; then
+        return 0
+    fi
+
     print-status Add bookmarks "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for line in $(cfg-read "${cfg_file}" bookmarks); do

bin/customize/other/cron

@@ -23,6 +23,11 @@ _setup-cronjob() {
     local cfg_file="${3:?Config file missing}"
     local line target name path
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" "cron-${frequency}"; then
+        return 0
+    fi
+
     print-status Setup "${frequency}" cron jobs "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for line in $(cfg-read "${cfg_file}" "cron-${frequency}"); do

bin/customize/other/local

@@ -18,6 +18,12 @@
 _run() {
     local selector="${1:?Selector missing}"
     local cfg_dir="${2:?Config dir missing}"
+    local scripts
+
+    scripts=$(run-parts --test "${cfg_dir}")
+    if [[ -z "${scripts}" ]]; then
+        return 0
+    fi
 
     print-header Run local scripts "[${selector}]..."
     (

bin/customize/packages/apt

@@ -20,6 +20,11 @@ _parse-install-packages() {
     local cfg_file="${2:?Config file missing}"
     local line package repo
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" apt-install; then
+        return 0
+    fi
+
     print-status Parse packages to install "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for line in $(cfg-read "${cfg_file}" apt-install); do
@@ -40,6 +45,11 @@ _parse-remove-packages() {
     local cfg_file="${2:?Config file missing}"
     local package
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" apt-remove; then
+        return 0
+    fi
+
     print-status Parse packages to remove "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for package in $(cfg-read "${cfg_file}" apt-remove); do
@@ -86,13 +96,17 @@ print-header Update apt cache...
 sudo apt-get update
 print-finish
 
-print-header Install "${packages_install[*]}..."
-sudo apt-get install --yes --no-install-recommends "${packages_install[@]}"
-print-finish
+if [[ -n "${packages_install[*]}" ]]; then
+    print-header Install "${packages_install[*]}..."
+    sudo apt-get install --yes --no-install-recommends "${packages_install[@]}"
+    print-finish
+fi
 
-print-header Remove "${packages_remove[*]}..."
-sudo apt-get remove --yes --purge --autoremove "${packages_remove[@]}"
-print-finish
+if [[ -n "${packages_remove[*]}" ]]; then
+    print-header Remove "${packages_remove[*]}..."
+    sudo apt-get remove --yes --purge --autoremove "${packages_remove[@]}"
+    print-finish
+fi
 
 print-header Upgrade packages...
 sudo apt-get upgrade --yes

bin/customize/packages/bin

@@ -20,6 +20,11 @@ _install() {
     local cfg_file="${2:?Config file missing}"
     local line name url checksum hash tmp_file
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" bin; then
+        return 0
+    fi
+
     print-header Install vendor shell programs "[${selector}]..."
     sudo mkdir -p "${bin_global}"
     # shellcheck disable=SC2310,SC2311

bin/customize/packages/node

@@ -20,6 +20,11 @@ _install() {
     local cfg_file="${2:?Config file missing}"
     local line package
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" node; then
+        return 0
+    fi
+
     print-header Install node modules "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for line in $(cfg-read "${cfg_file}" node); do

bin/customize/packages/snap

@@ -20,6 +20,11 @@ _install() {
     local cfg_file="${2:?Config file missing}"
     local snaps_installed line package mode options
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" snap; then
+        return 0
+    fi
+
     print-header Install snaps "[${selector}]..."
     snaps_installed=$(snap list --color=never --unicode=never)
     # shellcheck disable=SC2310,SC2311

bin/customize/services/apache

@@ -20,6 +20,11 @@ _install-module() {
     local cfg_file="${2:?Config file missing}"
     local module modules=()
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" apache-module; then
+        return 0
+    fi
+
     print-header Install Apache modules "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for module in $(cfg-read "${cfg_file}" apache-module); do

bin/customize/system/dirs

@@ -20,6 +20,11 @@ _dirs-create() {
     local cfg_file="${2:?Config file missing}"
     local line path owner
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" dirs-create; then
+        return 0
+    fi
+
     print-status Create dirs "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for line in $(cfg-read "${cfg_file}" dirs-create); do
@@ -43,6 +48,11 @@ _dirs-remove() {
     local cfg_file="${2:?Config file missing}"
     local line
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" dirs-remove; then
+        return 0
+    fi
+
     print-status Remove dirs "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for line in $(cfg-read "${cfg_file}" dirs-remove); do
@@ -79,6 +89,7 @@ if file=$(cfg-get "${profile}" system/local.cfg); then
     _dirs-remove local "${file}"
     cfg-eval "${file}" perms
 fi
+[[ -z "${perm_home}" ]] && exit 1
 
 print-status Set permission on "/home/${USER}..."
 sudo chown "${USER}:${USER}" ~

bin/customize/system/locale

@@ -20,6 +20,11 @@ _install-locale() {
     local cfg_file="${2:?Config file missing}"
     local locale
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" locales; then
+        return 0
+    fi
+
     print-header Install locale "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for locale in $(cfg-read "${cfg_file}" locales); do
@@ -38,6 +43,11 @@ _set-locale() {
     local cfg_file="${2:?Config file missing}"
     local line category locale
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" locale; then
+        return 0
+    fi
+
     print-status Set locales "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for line in $(cfg-read "${cfg_file}" locale); do

bin/customize/system/users

@@ -20,6 +20,11 @@ _create-user() {
     local cfg_file="${2:?Config file missing}"
     local existent_users user type existent_groups groups group options
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" users; then
+        return 0
+    fi
+
     existent_users=$(getent passwd | cut -d: -f1)
     existent_groups=$(getent group | cut -d: -f1)
 

bin/customize/tools/git

@@ -20,6 +20,11 @@ _config() {
     local cfg_file="${2:?Config file missing}"
     local line cfg_loc cfg_name cfg_value
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" git; then
+        return 0
+    fi
+
     print-status Config git "[${selector}]..."
     # shellcheck disable=SC2310,SC2311
     for line in $(cfg-read "${cfg_file}" git); do

bin/customize/tools/ssh

@@ -36,6 +36,11 @@ _known-hosts() {
     local cfg_file="${2:?Config file missing}"
     local line
 
+    # shellcheck disable=SC2310
+    if is-empty-section "${cfg_file}" ssh-known; then
+        return 0
+    fi
+
     print-status Setup known hosts "[${selector}]..."
     mkdir -p ~/.ssh
     touch ~/.ssh/known_hosts

bin/library.sh

@@ -152,6 +152,20 @@ cfg-read() {
     sed -r -e '/^\s*\[/ d' <<<"${contents}"
 }
 
+## Check section is defined and not empty in config file
+##
+## @param    $1  Config File
+## @param    $2  Section
+########################################################
+is-empty-section() {
+    local file="${1:?File missing}"
+    local section="${2:?Section missing}"
+    local contents
+
+    contents=$(cfg-read "${cfg_file}" "${section}")
+    [[ -z "${contents}" ]]
+}
+
 ## Eval config file
 ##
 ## @param    $1  Config File

example/default/system/global.cfg

@@ -48,15 +48,6 @@ mok_key_subject="/O=ES-Progress/OU=HeadQuarters/CN=Zephyr Machine Owner Key"
 # Perms on $HOME (non-recursive)
 perm_home=o-rwx
 
-## Users
-##
-## Format:
-## user_name [type] [groups]
-############################
-[users]
-$USER normal users,www-data,nonexistent-group
-zephyr system
-
 ## Locales to install
 ##
 ##
@@ -76,3 +67,12 @@ hu_HU.UTF-8
 [locale]
 LANG en_GB.UTF-8
 LC_NUMERIC hu_HU.UTF-8
+
+## Users
+##
+## Format:
+## user_name [type] [groups]
+############################
+[users]
+$USER normal users,www-data,nonexistent-group
+zephyr system