--- trunk/installer/ncurses-gui/install.sh	2010/05/30 17:33:29	1013
+++ trunk/installer/ncurses-gui/install.sh	2010/05/31 22:17:52	1068
@@ -2,56 +2,37 @@
 
 system_setup()
 {
-	include/prepare_auth.sh &> /dev/null
+	${INSTALLER_DIR}/include/prepare_auth.sh &>> ${INSTALLER_LOG}
 	echo 25
-	
-	include/prepare_networking.sh &> /dev/null
+
+	${INSTALLER_DIR}/include/prepare_locale.sh &>> ${INSTALLER_LOG}
 	echo 50
-	
-	include/prepare_fstab.sh &> /dev/null
+
+	${INSTALLER_DIR}/include/prepare_networking.sh &>> ${INSTALLER_LOG}
+	echo 65
+
+	${INSTALLER_DIR}/include/prepare_fstab.sh &>> ${INSTALLER_LOG}
 	echo 75
-	
-	include/prepare_initrd.sh &> /dev/null
+
+	${INSTALLER_DIR}/include/prepare_initrd.sh &>> ${INSTALLER_LOG}
 	echo 100
 }
 
-# fake_process()
-# {
-# 	sleep 1
-# 	#echo 25
-# 	echo -e "\nXXX\nNew Message\nXXX\n25"
-# 
-# 	sleep 1
-# 	#echo 50
-# 	echo -e "\nXXX\nNew Message2\nXXX\n50"
-# 	
-# 	sleep 1
-# 	#echo 75
-# 	echo -e "\nXXX\nNew Message3\nXXX\n75"
-# 	
-# 	sleep 1
-# 	echo 100
-# }
-
 main_install()
 {
-	include/prepare_disks.sh --format | gauge "Installing" "Formating disks..." 10 70
-	include/prepare_disks.sh --mount
+	# create an empty installer log
+	${INSTALLER_DIR}/include/install_log.sh --prepare
+
+	${INSTALLER_DIR}/include/prepare_disks.sh --format --ncurses | gauge "Installing" "Formating disks..." 10 70
+	${INSTALLER_DIR}/include/prepare_disks.sh --mount &>> ${INSTALLER_LOG}
 
-	include/bootstrap-wrapper.sh --ncurses | gauge "Installing" "Installing system..." 10 70
+	${INSTALLER_DIR}/include/bootstrap-wrapper.sh --ncurses | gauge "Installing" "Installing system..." 10 70
 
 	system_setup | gauge "Installing" "Setup system settings..." 10 70
-	include/prepare_bootloader | gauge "Installing" "Installing Bootloader..." 10 70
+	${INSTALLER_DIR}/include/prepare_bootloader.sh | gauge "Installing" "Installing Bootloader..." 10 70
 
-	include/prepare_disks.sh --umount
-}
+	# copy install log to install root
+	${INSTALLER_DIR}/include/install_log.sh --copy
 
-# main_install()
-# {
-# 	fake_process | gauge "Installing" "Formating disks..." 10 70
-# 	fake_process | gauge "Installing" "Installing system..." 10 70
-# 	fake_process | gauge "Installing" "Setup system settings..." 10 70
-# 	fake_process | gauge "Installing" "Installing Bootloader..." 10 70
-# 
-# 	include/bootstrap-wrapper.sh --ncurses | gauge "Installing" "Installing system...\n\n" 10 70
-# }
+	${INSTALLER_DIR}/include/prepare_disks.sh --umount &>> ${INSTALLER_LOG}
+}