From dbfeba80b2261e0b2f0df4edd7872be8f0e5a46b Mon Sep 17 00:00:00 2001
From: Aaditya Bagga <aaditya_gnulinux@zoho.com>
Date: Thu, 18 Dec 2014 21:44:55 +0530
Subject: [PATCH] refactor and try to fix livecd-image-generation

---
 lib/util-livecd.sh | 98 +++++++++++++---------------------------------
 1 file changed, 27 insertions(+), 71 deletions(-)

diff --git a/lib/util-livecd.sh b/lib/util-livecd.sh
index d36145f..63ad109 100644
--- a/lib/util-livecd.sh
+++ b/lib/util-livecd.sh
@@ -295,16 +295,9 @@ configure_alsa_live(){
     $alsa_amixer -c 0 sset "Audigy Analog/Digital Output Jack" off &>/dev/null
 }
 
-configure_live_installer_live(){
-    if [ -e "/etc/live-installer/install.conf" ] ; then
-      _conf_file="/etc/live-installer/install.conf"
-    fi
-}
-
-configure_calamares_live(){
-    if [ -e "/usr/share/calamares/settings.conf" ] ; then
-	echo "configure calamares" >> /tmp/livecd.log
-	_conf_file="/usr/share/calamares/modules/unpackfs.conf"
+configure_live_image () {
+    _conf_file="$1" # Configuration file passed as first argument
+    if [ -e "$_conf_file" ] ; then
 	sed -i "s|_root-image_|/bootmnt/${install_dir}/_ARCH_/root-image.sqfs|g" $_conf_file
 	sed -i "s|_kernel_|$manjaro_kernel|g" "/usr/share/calamares/modules/initcpio.conf"
 
@@ -349,68 +342,31 @@ configure_calamares_live(){
     fi
 }
 
-configure_thus_live(){
-  if [ -e "/etc/thus.conf" ] ; then
-      echo "configure thus" >> /tmp/livecd.log
-      _conf_file="/etc/thus.conf"
-  fi
-
-    if [ -e "$_conf_file" ] ; then
-	sed -i "s|_root-image_|/bootmnt/${install_dir}/_ARCH_/root-image.sqfs|g" $_conf_file
-	sed -i "s|_kernel_|$manjaro_kernel|g" $_conf_file
-	release=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2)
-	sed -i "s|_version_|$release|g" $_conf_file
-
-	if [ -e "/bootmnt/${install_dir}/${arch}/xfce-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/xfce-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro XFCE Edition|g" $_conf_file
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/gnome-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/gnome-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro Gnome Edition|g" $_conf_file
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/cinnamon-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/cinnamon-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro Cinnamon Edition|g" $_conf_file
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/openbox-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/openbox-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro Openbox Edition|g" $_conf_file
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/mate-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/mate-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro MATE Edition|g" $_conf_file
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/kde-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/kde-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro KDE Edition|g" $_conf_file
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/lxde-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/lxde-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro LXDE Edition|g" $_conf_file
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/lxqt-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/lxqt-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro LXQt Edition|g" $_conf_file
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/enlightenment-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/enlightenment-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro Enlightenment Edition|g" $_conf_file
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/pekwm-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/pekwm-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro PekWM Edition|g" $_conf_file
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/custom-image.sqfs" ] ; then
-	    sed -i "s|_desktop_|/bootmnt/${install_dir}/_ARCH_/custom-image.sqfs|g" $_conf_file
-	    sed -i "s|_title_|Manjaro Custom Edition|g" $_conf_file
-	fi
-	if [ "${arch}" == "i686" ] ; then
-	    sed -i "s|_ARCH_|i686|g" $_conf_file
-	else
-	    sed -i "s|_ARCH_|x86_64|g" $_conf_file
-	fi
+configure_live_installer_live(){
+    if [ -e "/etc/live-installer/install.conf" ] ; then
+      _conf_file="/etc/live-installer/install.conf"
     fi
+    release=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2)
+    sed -i "s|_version_|$release|g" $_conf_file
+    configure_live_image $_conf_file
+}
+
+configure_calamares_live(){
+    if [ -e "/usr/share/calamares/settings.conf" ] ; then
+	echo "configure calamares" >> /tmp/livecd.log
+	_conf_file="/usr/share/calamares/modules/unpackfs.conf"
+    fi
+    configure_live_image $_conf_file
+}
+
+configure_thus_live(){
+    if [ -e "/etc/thus.conf" ] ; then
+        echo "configure thus" >> /tmp/livecd.log
+        _conf_file="/etc/thus.conf"
+    fi
+    release=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2)
+    sed -i "s|_version_|$release|g" $_conf_file
+    configure_live_image $_conf_file
 }
 
 fix_kdm(){