--- trunk/installer-simple/bin/installer.sh.in	2014/01/03 15:01:06	2344
+++ trunk/installer-simple/bin/installer.sh.in	2014/01/07 13:03:58	2397
@@ -16,6 +16,12 @@
 # -> now in images.conf
 CURRENTLINE=0
 
+die()
+{
+	echo "Error: $@"
+	exit 1
+}
+
 # configuration
 if [ -e %SYSCONFDIR%/installer.conf ]
 then
@@ -70,12 +76,6 @@
 #		  DIALOG BOXEN			#
 #################################################
 
-die()
-{
-	echo "Error: $@"
-	exit 1
-}
-
 dialog_die()
 {
 	ERROR="$1"
@@ -180,7 +180,7 @@
 	local i
 	local hwtmp
 
-	if [ -x $(which mktemp &> /dev/null) ]
+	if [ -x $(type -P mktemp) ]
 	then
 		hwtmp="$(mktemp)"
 	else
@@ -831,7 +831,7 @@
 
 is_uuid_supported()
 {
-	if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]
+	if [[ -x $(type -P busybox.mkinitrd) ]]
 	then
 		# only detect uuids if supported
 		if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]