--- trunk/installer-simple/bin/installer.sh.in	2014/01/03 14:20:42	2339
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/03 14:38:46	2341
@@ -9,9 +9,13 @@
 
 # ignore the environment
 LC_ALL=C
-
+# include dir
 INSTALLER_LIBDIR="%LIBDIR%"
 
+# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
+# -> now in images.conf
+CURRENTLINE=0
+
 # configuration
 if [ -e %SYSCONFDIR%/installer.conf ]
 then
@@ -20,10 +24,17 @@
 	die "/etc/installer.conf not found"
 fi
 
-#images: (get ${CDIMAGENAME})
+# TOTALLINES=linecount of ${CDIMAGENAME}-tarball -1 !
+# -> now in images.conf
+CDIMAGENAME=""
+TOTALLINES=""
+CURRENTLINE=0
 if [ -e /mnt/cdrom/system/images.conf ]
 then
 	source /mnt/cdrom/system/images.conf
+	# check if all required variables are set
+	[[ -z ${CDIMAGENAME} ]] && die "CDIMAGENAME is empty in /mnt/cdrom/system/images.conf"
+	[[ -z ${TOTALLINES} ]] && die "TOTALLINES is empty in /mnt/cdrom/system/images.conf"
 else
 	die "/mnt/cdrom/system/images.conf not found"
 fi
@@ -38,10 +49,6 @@
 CDPATH="${DEFAULT_CDPATH}"
 INSTALLPATH="${DEFAULT_INSTALLPATH}"
 
-### WICHTIG: anzahl lines in der autosta_lx.tar.gz -1
-CURRENTLINE=0
-#TOTALLINES=11072 # -> now in images.conf
-
 # standard kernel opts
 KERNELOPTS="quiet video=1024x768"
 
@@ -71,8 +78,8 @@
 
 dialog_die()
 {
-	ERROR=$1
-	RETVAL=$?
+	ERROR="$1"
+	RETVAL="$?"
 	dialog_install_failure
 	exit 1
 }
@@ -161,7 +168,7 @@
 	then
 		case "${i}" in
 			"1") run_install_auto ;;
-        		"2") run_install_normal ;;
+			"2") run_install_normal ;;
 			"3") run_install_flash ;;
 			"") dialog_setup_system_menu;;
 		esac
@@ -448,7 +455,7 @@
 		if [[ ${RES} -eq 0 ]]
 		then
 			case ${METHOD} in
-        			"1") dialog_setup_system_menu ;;
+				"1") dialog_setup_system_menu ;;
 				"2") dialog_hardware_detection ;;
 				"3") install_do_reboot ;;
 				"4") /bin/bash --login -i ;;