From 25b3bc1d6199868030da97ac9857daffbb634738 Mon Sep 17 00:00:00 2001
From: Frede Hundewadt <fh@manjaro.org>
Date: Sun, 1 Mar 2020 11:50:56 +0100
Subject: [PATCH] Adding `office_installer` to profile.conf - default to
 `false` Added `-o` to buildiso to activate office_installer per build
 Modified `util-yaml.sh` to handle setting Modified `util.sh` to handle the
 setting

---
 bin/buildiso.in           |  8 ++++++--
 data/profile.conf.example |  3 +++
 lib/util-yaml.sh          | 14 +++++++-------
 lib/util.sh               | 11 +++++++++++
 4 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/bin/buildiso.in b/bin/buildiso.in
index 471e16a..24427aa 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -29,6 +29,7 @@ show_profile(){
         [[ ${target_arch} == 'x86_64' ]] && msg2 "multilib: %s" "${multilib}"
 
         msg2 "extra: %s" "${extra}"
+        msg2 "office_installer: %s" "${office_installer}"
         msg2 "permalink: %s" "${permalink}"
 
         msg2 "netinstall: %s" "${netinstall}"
@@ -63,7 +64,7 @@ display_settings(){
     show_config
 
     msg "PROFILE:"
-    msg2 "gitlab brach: %s" "${branch}"
+    msg2 "gitlab branch: %s" "${branch}"
     msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
     msg2 "build_list_iso: %s" "${build_list_iso}"
     msg2 "is_build_list: %s" "${is_build_list}"
@@ -81,6 +82,7 @@ display_settings(){
     msg2 "persist: %s" "${persist}"
     msg2 "extra: %s" "${full_iso}"
     msg2 "permalink: %s" "${permalink}"
+    msg2 "office_installer: %s" "${office_installer}"
 
     msg "DIST SETTINGS:"
     msg2 "dist_name: %s" "${dist_name}"
@@ -128,6 +130,7 @@ usage() {
     echo '    -l                 Create permalink'
     echo '    -m                 Set SquashFS image mode to persistence'
     echo "    -p <profile>       Buildset or profile [default: ${build_list_iso}]"
+    echo '    -o                 Enable office installer module'    
     echo '    -q                 Query settings and pretend build'
     echo '    -r <dir>           Chroots directory'
     echo "                       [default: ${chroots_iso}]"
@@ -145,7 +148,7 @@ usage() {
 
 orig_argv=("$@")
 
-opts='p:a:b:r:t:k:g:d:cfzxmvqhil'
+opts='p:a:b:r:t:k:g:d:cfzxmvqhilon'
 
 while getopts "${opts}" arg; do
     case "${arg}" in
@@ -166,6 +169,7 @@ while getopts "${opts}" arg; do
         x) images_only=true ;;
         z) iso_only=true ;;
         l) permalink=true ;;
+        n) office_installer=false ;;
         h|?) usage 0 ;;
         *) echo "invalid argument '${arg}'"; usage 1 ;;
     esac
diff --git a/data/profile.conf.example b/data/profile.conf.example
index fb34109..83904e9 100644
--- a/data/profile.conf.example
+++ b/data/profile.conf.example
@@ -8,6 +8,9 @@
 # use extra packages as defined in pkglist to activate a full profile
 # extra="false"
 
+# use office installer module
+# office_installer="false"
+
 ################ install ################
 
 # default displaymanager: none
diff --git a/lib/util-yaml.sh b/lib/util-yaml.sh
index f4e6c81..a53c6ff 100644
--- a/lib/util-yaml.sh
+++ b/lib/util-yaml.sh
@@ -294,15 +294,15 @@ write_settings_conf(){
     else
         echo "        - users" >> "$conf" && write_users_conf
     fi
+    
     # WIP - OfficeChooser
-    if ${extra}; then
-        if ${oem_used}; then
-            msg2 "Skipping enabling PackageChooser module."
-        else
-            msg2 "Enabling PackageChooser module."
-            echo "        - packagechooser" >> "$conf"
-        fi
+    if ${oem_used} || ! ${office_installer}; then
+        msg2 "Skipping enabling PackageChooser module."
+    else
+        msg2 "Enabling PackageChooser module."
+        echo "        - packagechooser" >> "$conf"
     fi
+
     if ${netinstall}; then
         echo "        - netinstall" >> "$conf" && write_netinstall_conf
     fi
diff --git a/lib/util.sh b/lib/util.sh
index d9e69af..a964454 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -460,6 +460,8 @@ load_profile_config(){
     basic='true'
     [[ ${extra} == 'true' ]] && basic='false'
 
+    [[ -z ${office_installer} ]] && office_installer="false"
+
     return 0
 }
 
@@ -622,6 +624,13 @@ load_pkgs(){
         ;;
     esac
 
+    local _office _office_rm
+    if ${office_chooser}; then
+        _office="s|>office||g"
+    else
+        _office_rm="s|>office.*||g"
+    fi
+
     local _blacklist="s|>blacklist.*||g" \
         _kernel="s|KERNEL|$kernel|g" \
         _used_kernel=${kernel:5:2} \
@@ -649,6 +658,8 @@ load_pkgs(){
             | sed "$_basic_rm" \
             | sed "$_extra" \
             | sed "$_extra_rm" \
+            | sed "$_office" \
+            | sed "$_office_rm" \            
             | sed "$_clean")
 
     if [[ $1 == "${packages_mhwd}" ]]; then