--- trunk/installer/guification.sh	2010/05/30 18:27:24	1033
+++ trunk/installer/guification.sh	2010/05/30 18:29:43	1034
@@ -1,17 +1,20 @@
 #! /bin/bash
 # $Id$
 
+# global config
+source /etc/installer.conf
+
 # helper scripts
-source include/functions.sh
-source include/hwdetection.sh
+source ${INSTALLER_DIR}/include/functions.sh
+source ${INSTALLER_DIR}/include/hwdetection.sh
 
 # gui
-source gtk-gui/common.sh
-source gtk-gui/locales.sh
-source gtk-gui/networking.sh
-source gtk-gui/diskpartition.sh
-source gtk-gui/usermanagement.sh
-source gtk-gui/install.sh
+source ${INSTALLER_DIR}/gtk-gui/common.sh
+source ${INSTALLER_DIR}/gtk-gui/locales.sh
+source ${INSTALLER_DIR}/gtk-gui/networking.sh
+source ${INSTALLER_DIR}/gtk-gui/diskpartition.sh
+source ${INSTALLER_DIR}/gtk-gui/usermanagement.sh
+source ${INSTALLER_DIR}/gtk-gui/install.sh
 
 # install root
 INSTALL_ROOT="/mnt/magellan"
@@ -70,8 +73,10 @@
 
 
 # set a reasonable background
-sleep 0.1; fbsetbg -f data/background.png
+sleep 0.1; fbsetbg -f ${INSTALLER_DIR}/data/background.png
 
+# change into ${INSTALLER_DIR} to simplify gtkdialogs includes
+pushd ${INSTALLER_DIR}
 
 # start the program
 rundialog WELCOME
@@ -124,4 +129,7 @@
 # end of everything
 rundialog FINISH
 
+# get back
+popd
+
 exit 0