--- trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:20:20	2404
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:54:06	2422
@@ -72,6 +72,18 @@
 #		  DIALOG BOXEN			#
 #################################################
 
+trap_exit()
+{
+	is_mounted --location "${INSTALLROOT}/dev" && umount ${INSTALLROOT}/dev
+	is_mounted --location "${INSTALLROOT}/proc" && umount ${INSTALLROOT}/proc
+	is_mounted --location "${INSTALLROOT}/sys" && umount ${INSTALLROOT}/sys
+	is_mounted --location "${INSTALLROOT}/boot" && umount ${INSTALLROOT}/boot
+	is_mounted --location "${INSTALLROOT}" && umount ${INSTALLROOT}
+
+	echo $"Installation aborted."
+	exit 1
+}
+
 dialog_die()
 {
 	ERROR="$1"
@@ -96,52 +108,35 @@
 
 dialog_setup_hdd_info()
 {
-	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
+	local SHDD="${HDD//\/dev\/}"
 
-	dialog \
-	--colors \
-	--title "[ Festplatten Partitionierung ]" \
-	--backtitle "${TITLE}" \
-	--ok-label "Weiter" \
-	--msgbox "\nBitte legen Sie 1 Partition an.\n\n\
-		[ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit dem gesamten Speicher\n\
-		Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
+	messagebox -h $"[ Harddrive partitioning ]" \
+		$"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."
 }
 
 dialog_setup_hdd_info_auto()
 {
-	local SHDD="$(echo $HDD | sed 's/\/dev\///')"
+	local SHDD="${HDD//\/dev\/}"
 
-	dialog \
-	--colors \
-	--title "[ Festplatten Partitionierung ]" \
-	--backtitle "${TITLE}" \
-	--ok-label "Weiter" \
-	--msgbox "\nAchtung!\n\
-		Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81
+	messagebox -h $"[ Harddrive partitioning ]" \
+		$"\Z1Warning!\Zn\n\nAll data on disk [ \Z3${HDD}\Zn ] will be erased!"
 }
 
 dialog_setup_system_menu()
 {
-	local i
+	local mode
+	local retval
 
-	i=$(dialog \
-	--backtitle "${TITLE}" \
-	--title "[ Festplatten Partitionierung ]" \
-	--cancel-label "Abbrechen" \
-	--ok-label "Weiter" \
-	--stdout \
-	--colors \
-	--menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
-	"1" "Automatisches Setup (Empfohlen)" \
-	"" "" \
-	"" "\Z1Experten Modi:\Zn" \
-	"2" "Normale IDE-Disk (Manuell)" \
-	RES=$?
-	[[ ${RES} -eq 1 ]] && return 1
-	if [[ ${RES} -eq 0 ]]
+	mode=$(menubox -h $"[ Harddrive partitioning ]" $"\nSelect an installation mode" \
+		$"1:Automatic setup (recommended)" \
+		":" \
+		$":\Z1Expert modes:\Zn" \
+		$"2:Common IDE-disk (manual setup)")
+	retval=$?
+	[[ ${retval} -eq 1 ]] && return 1
+	if [[ ${retval} -eq 0 ]]
 	then
-		case "${i}" in
+		case "${mode}" in
 			"1") run_install_auto ;;
 			"2") run_install_normal ;;
 			"") dialog_setup_system_menu;;
@@ -151,102 +146,65 @@
 
 dialog_hardware_detection()
 {
-	local i
-	local hwtmp
-
-	if [ -x $(type -P mktemp) ]
-	then
-		hwtmp="$(mktemp)"
-	else
-		hwtmp="/tmp/hwtmp.sh"
-	fi
+	local message
 
 	run_hardware_detection_disks
 
-	echo "dialog \\"  > ${hwtmp}
-	echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
-	echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
-	echo "--stdout \\" >> ${hwtmp}
-	echo "--colors \\" >> ${hwtmp}
-	echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
-	echo "	Festplatten:\n \\" >> ${hwtmp}
+	message+=$"Harddrives:\n"
 
 	if [[ ! -z ${ALL_DISKS} ]]
 	then
 		for i in ${ALL_DISKS}
 		do
-			echo "		\\Z3${i}\\Zn\n \\" >> ${hwtmp}
+			message+="\Z3${i}\Zn "
 		done
+		message+="\n"
 	fi
 
 	if [[ ! -z ${ALL_CDROMS} ]]
 	then
-		echo "	\n \\" >> ${hwtmp}
-		echo "	CDROM Laufwerke:\n \\" >> ${hwtmp}
+		message+="\n"
+		message+=$"Optical disk drives:\n"
 		for i in ${ALL_CDROMS}
 		do
-			echo "		\\Z3${i}\\Zn\n \\" >> ${hwtmp}
+			message+="\Z3${i}\Zn"
 		done
+		message+="\n"
 	fi
 
 	# other devices
 	run_hardware_detection
 	case "${SPECIALDEVICE}" in
-		zotac*) echo "	\n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
-		rangee) echo "	\n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
-		maxdata) echo "	\n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
-		*) echo "	\n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
+		zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
+		rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
+		maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
+		*) message+=$"\n \\ZnCommon device detected.\Zn" ;;
 	esac
 	if [[ ${FORMFACTOR} = laptop ]]
 	then
-		echo "	\n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}
+		message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"
 	fi
 
-	echo "	\" 14 70" >> ${hwtmp}
-	chmod a+x ${hwtmp}
-	${hwtmp}
-
-	# remove tmp file
-	if [[ -f ${hwtmp} ]]
-	then
-		rm ${hwtmp}
-	fi
+	messagebox -y 15 -h $"Detected hardware:" "${message}"
 }
 
-dialog_setup_hdd_partitions_manuell()
+dialog_setup_hdd_partitions_manual()
 {
 	local i
+	local retval
 
-	if [[ -z ${installdevs} ]]
+	if [[ -z ${ALL_DISKS} ]]
 	then
-		dialog \
-		--backtitle "${TITLE}" \
-		--ok-label "Beenden" \
-		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
+		dialog_no_harddrive_found
 		exit 1
 	else
-
-		echo "dialog \\" > /tmp/hddtmp.sh
-		echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
-		echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
-		echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
-		echo "--stdout \\" >> /tmp/hddtmp.sh
-		echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
-
-		for i in ${installdevs}
-		do
-			echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
-		done
-		echo -e "\n" >> /tmp/hddtmp.sh
-
-		chmod a+x /tmp/hddtmp.sh
-		HDD="$(/tmp/hddtmp.sh)"
-		RES=$?
-		[[ ${RES} -eq 1 ]] && return 1
-		if [[ ${RES} -eq 0 ]]
+		HDD=$(dialog_select_target_harddrive)
+		retval=$?
+		[[ ${retval} -eq 1 ]] && return 1
+		if [[ ${retval} -eq 0 ]]
 		then
 			dialog_setup_hdd_info
-			setup_hdd_partitions_manuell
+			setup_hdd_partitions_manual
 		fi
 	fi
 }
@@ -254,34 +212,17 @@
 dialog_setup_hdd_partitions_auto()
 {
 	local i
+	local retval
 
-	if [[ -z ${installdevs} ]]
+	if [[ -z ${ALL_DISKS} ]]
 	then
-		dialog \
-		--backtitle "${TITLE}" \
-		--ok-label "Beenden" \
-		--msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
+		dialog_no_harddrive_found
 		exit 1
 	else
-
-		echo "dialog \\" > /tmp/hddtmp.sh
-		echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
-		echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
-		echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
-		echo "--stdout \\" >> /tmp/hddtmp.sh
-		echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
-
-		for i in ${installdevs}
-		do
-			echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
-		done
-		echo -e "\n" >> /tmp/hddtmp.sh
-
-		chmod a+x /tmp/hddtmp.sh
-		HDD="$(/tmp/hddtmp.sh)"
-		RES=$?
-		[[ ${RES} -eq 1 ]] && return 1
-		if [[ ${RES} -eq 0 ]]
+		HDD=$(dialog_select_target_harddrive)
+		retval=$?
+		[[ ${retval} -eq 1 ]] && return 1
+		if [[ ${retval} -eq 0 ]]
 		then
 			dialog_setup_hdd_info_auto
 			dialog_setup_hdd_create_partitions
@@ -542,11 +483,11 @@
 	fi
 }
 
-setup_hdd_partitions_manuell()
+setup_hdd_partitions_manual()
 {
 	ROOTHDD="${HDD}1"
 
-	## hdds partitionieren manuell
+	## hdds partitionieren manual
 	cfdisk ${HDD} || dialog_die
 }
 
@@ -823,7 +764,7 @@
 {
 	dialog_hardware_detection
 
-	dialog_setup_hdd_partitions_manuell
+	dialog_setup_hdd_partitions_manual
 	dialog_setup_hdd_format
 	setup_hdd_format > /dev/null
 	install_mount_rootfs
@@ -863,6 +804,9 @@
 	dialog_install_successful
 }
 
+# set some proper traps
+trap "trap_exit" SIGINT SIGQUIT
+
 dialog_main
 
 exit 0