From e59ec4d3dc0c74548ca9240a688fb91cb48695e3 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Thu, 29 Jan 2015 01:12:23 +0100
Subject: [PATCH] [buildiso/util-iso] clean up code; some cosmetics

---
 lib/util-iso.sh | 71 +++++++++++--------------------------------------
 1 file changed, 15 insertions(+), 56 deletions(-)

diff --git a/lib/util-iso.sh b/lib/util-iso.sh
index 392d250..cae345d 100644
--- a/lib/util-iso.sh
+++ b/lib/util-iso.sh
@@ -195,7 +195,7 @@ aufs_mount_de_image(){
 # $1: del branch
 aufs_remove_image(){
     if mountpoint -q $1;then
-        msg2 "Unmount ${1##*/}"
+        msg2 "unmount ${1##*/}"
 	umount $1
     fi
 }
@@ -557,32 +557,32 @@ make_isomounts() {
 
 # $1: file name
 load_pkgs(){
-    msg "Loading Packages: [$1] ..."
+    msg3 "Loading Packages: [$1] ..."
     
-    if [ "${arch}" == "i686" ]; then
+    if [[ "${arch}" == "i686" ]]; then
 	packages=$(sed "s|#.*||g" $1 | sed "s| ||g" | sed "s|>dvd.*||g"  | sed "s|>blacklist.*||g" | sed "s|>x86_64.*||g" | sed "s|>i686||g" | sed "s|KERNEL|$manjaro_kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
-    elif [ "${arch}" == "x86_64" ]; then
+    elif [[ "${arch}" == "x86_64" ]]; then
 	packages=$(sed "s|#.*||g" $1 | sed "s| ||g" | sed "s|>dvd.*||g"  | sed "s|>blacklist.*||g" | sed "s|>i686.*||g" | sed "s|>x86_64||g" | sed "s|KERNEL|$manjaro_kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
     fi
 }
 
 load_pkgs_xorg(){
-    msg "Loading Packages: [Packages-Xorg] ..."
+    msg3 "Loading Packages: [Packages-Xorg] ..."
     
-    if [ "${arch}" == "i686" ]; then
+    if [[ "${arch}" == "i686" ]]; then
 	packages_xorg=$(sed "s|#.*||g" Packages-Xorg | sed "s| ||g" | sed "s|>dvd.*||g"  | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "s|>x86_64.*||g" | sed "s|>i686||g" | sed "s|>free_x64.*||g" | sed "s|>free_uni||g" | sed "s|>nonfree_x64.*||g" | sed "s|>nonfree_uni||g" | sed "s|KERNEL|$manjaro_kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
-    elif [ "${arch}" == "x86_64" ]; then
+    elif [[ "${arch}" == "x86_64" ]]; then
 	packages_xorg=$(sed "s|#.*||g" Packages-Xorg | sed "s| ||g" | sed "s|>dvd.*||g"  | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "s|>i686.*||g" | sed "s|>x86_64||g" | sed "s|>free_x64||g" | sed "s|>free_uni||g" | sed "s|>nonfree_uni||g" | sed "s|>nonfree_x64||g" | sed "s|KERNEL|$manjaro_kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
     fi
     packages_xorg_cleanup=$(sed "s|#.*||g" Packages-Xorg | grep cleanup | sed "s|>cleanup||g" | sed "s|KERNEL|$manjaro_kernel|g" | sed ':a;N;$!ba;s/\n/ /g')
 }
 
 load_pkgs_lng(){
-    msg "Loading Packages: [Packages-Lng] ..."
+    msg3 "Loading Packages: [Packages-Lng] ..."
 
-    if [ "${arch}" == "i686" ]; then
+    if [[ "${arch}" == "i686" ]]; then
 	packages_lng=$(sed "s|#.*||g" Packages-Lng | sed "s| ||g" | sed "s|>dvd.*||g"  | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "s|>x86_64.*||g" | sed "s|>i686||g" | sed "s|>kde.*||g" | sed ':a;N;$!ba;s/\n/ /g')
-    elif [ "${arch}" == "x86_64" ]; then
+    elif [[ "${arch}" == "x86_64" ]]; then
 	packages_lng=$(sed "s|#.*||g" Packages-Lng | sed "s| ||g" | sed "s|>dvd.*||g"  | sed "s|>blacklist.*||g" | sed "s|>cleanup.*||g" | sed "s|>i686.*||g" | sed "s|>x86_64||g" | sed "s|>kde.*||g" | sed ':a;N;$!ba;s/\n/ /g')
     fi
     packages_lng_cleanup=$(sed "s|#.*||g" Packages-Lng | grep cleanup | sed "s|>cleanup||g")
@@ -591,59 +591,17 @@ load_pkgs_lng(){
 
 # $1: profile
 load_profile(){
-    msg "Loading Profile [$1] ..."
+    msg3 "Profile: [$1] ..."
 
     local files=$(ls Packages*)
     
     for f in ${files[@]};do
         case $f in
-            Packages|Packages-Livecd|Packages-Xorg*|Packages-Lng*) continue ;;
-            *) pkgsfile="$f"; msg2 "desktop list: $f" ;;
+            Packages|Packages-Livecd*|Packages-Xorg*|Packages-Lng*) continue ;;
+            *) pkgsfile="$f"; msg2 "Packages-$f: $f" ;;
         esac
     done
-#     if [ -e Packages-Xfce ] ; then
-# 	pkgsfile="Packages-Xfce"
-#     fi
-#     if [ -e Packages-Kde ] ; then
-#     	pkgsfile="Packages-Kde"
-#     fi
-#     if [ -e Packages-Gnome ] ; then
-#    	pkgsfile="Packages-Gnome" 
-#     fi
-#     if [ -e Packages-Cinnamon ] ; then
-#    	pkgsfile="Packages-Cinnamon" 
-#     fi
-#     if [ -e Packages-Openbox ] ; then
-#   	pkgsfile="Packages-Openbox"  
-#     fi
-#     if [ -e Packages-Lxde ] ; then
-#  	pkgsfile="Packages-Lxde"   
-#     fi
-#     if [ -e Packages-Lxqt ] ; then
-#     	pkgsfile="Packages-Lxqt"
-#     fi
-#     if [ -e Packages-Mate ] ; then
-#     	pkgsfile="Packages-Mate"
-#     fi
-#     if [ -e Packages-Enlightenment ] ; then
-#     	pkgsfile="Packages-Enlightenment"
-#     fi
-#     if [ -e Packages-Net ] ; then
-#    	pkgsfile="Packages-Net" 
-#     fi
-#     if [ -e Packages-PekWM ] ; then
-# 	pkgsfile="Packages-PekWM"
-#     fi
-#     if [ -e Packages-Kf5 ] ; then
-# 	pkgsfile="Packages-Kf5"
-#     fi
-#     if [ -e Packages-i3 ] ; then
-# 	pkgsfile="Packages-i3"
-#     fi
-#     if [ -e Packages-Custom ] ; then
-#     	pkgsfile="Packages-Custom"
-#     fi
-
+    
     desktop=${pkgsfile#*-}
     desktop=${desktop,,}
     
@@ -660,6 +618,7 @@ load_profile(){
     create_args+=(-C ${pacman_conf})
     
     work_dir=${chroots_iso}/$1/${arch}
+    
 }
 
 compress_images(){