From e920f977706885669dc0c79a5e41177d0cde280b Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Thu, 29 Jan 2015 05:13:25 +0100
Subject: [PATCH] [util-livecd] move calamares and thus out

---
 lib/util-livecd.sh | 84 ----------------------------------------------
 1 file changed, 84 deletions(-)

diff --git a/lib/util-livecd.sh b/lib/util-livecd.sh
index 7ef3b83..75b3529 100644
--- a/lib/util-livecd.sh
+++ b/lib/util-livecd.sh
@@ -288,90 +288,6 @@ configure_alsa_live(){
     $alsa_amixer -c 0 sset "Audigy Analog/Digital Output Jack" off &>/dev/null
 }
 
-configure_live_image () {
-    cmd=$(echo "QT_STYLE_OVERRIDE=gtk" >> /etc/environment)
-    if [ -e "$1" ] ; then
-	sed -i "s|_root-image_|/bootmnt/${install_dir}/_ARCH_/root-image.sqfs|g" $1
-
-	if [ -e "/bootmnt/${install_dir}/${arch}/xfce-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/xfce-image.sqfs|g" $1
-	    $cmd
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/gnome-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/gnome-image.sqfs|g" $1
-	    $cmd
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/cinnamon-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/cinnamon-image.sqfs|g" $1
-	    $cmd
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/openbox-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/openbox-image.sqfs|g" $1
-	    $cmd
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/mate-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/mate-image.sqfs|g" $1
-	    $cmd
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/kde-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/kde-image.sqfs|g" $1
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/lxde-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/lxde-image.sqfs|g" $1
-	    $cmd
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/lxqt-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/lxqt-image.sqfs|g" $1
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/enlightenment-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/enlightenment-image.sqfs|g" $1
-	    $cmd
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/pekwm-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/pekwm-image.sqfs|g" $1
-	    $cmd
-	fi
-	if [ -e "/bootmnt/${install_dir}/${arch}/custom-image.sqfs" ] ; then
-	    sed -i "s|_desktop-image_|/bootmnt/${install_dir}/_ARCH_/custom-image.sqfs|g" $1
-	fi
-	if [ "${arch}" == "i686" ] ; then
-	    sed -i "s|_ARCH_|i686|g" $1
-	else
-	    sed -i "s|_ARCH_|x86_64|g" $1
-	fi
-    fi
-}
-
-get_release(){
-    echo $(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2)
-}
-
-configure_thus_live(){
-    local conf_file="/etc/thus.conf"
-    if [[ -f "$conf_file" ]];then 
-	echo "configure thus" >> /tmp/livecd.log
-	release=$(get_release)
-	sed -i "s|_version_|$release|g" $conf_file
-	sed -i "s|_kernel_|$manjaro_kernel|g" $conf_file
-	configure_live_image "$conf_file"
-	mkdir -p /home/${username}/Desktop
-	cp /usr/share/applications/thus.desktop /home/${username}/Desktop/thus.desktop
-	chmod a+x /home/${username}/Desktop/thus.desktop
-    fi
-}
-
-configure_calamares_live(){
-    local conf_file="/usr/share/calamares/modules/unpackfs.conf"
-    if [[ -f "$conf_file" ]] ; then
-        echo "configure calamares" >> /tmp/livecd.log
-	sed -i "s|_kernel_|$manjaro_kernel|g" "/usr/share/calamares/modules/initcpio.conf"
-	configure_live_image "$conf_file"
-	mkdir -p /home/${username}/Desktop
-	cp /usr/share/applications/calamares.desktop /home/${username}/Desktop/calamares.desktop
-	chmod a+x /home/${username}/Desktop/calamares.desktop
-    fi
-}
-
 configure_displaymanager_live(){
     if [[ -f /usr/bin/lightdm ]];then
 	gpasswd -a ${username} autologin &> /dev/null