iup: refactor function handle_provisioning()

iup/files/sbin/iup

@@ -181,23 +181,25 @@ handle_provisioning() {
 	local url
 	local tftpfile
 	local host
-	local md5
 	local defaultreset
-	local pack
+	local deckey
-	local packname
-	local number=$RANDOM
 	local retry=1
-	local number
 	local incsleep=$SLEEP
+	local number=$RANDOM
 	let "number %= $RANGE"
-	if [[ ! -e $IUPTEMP ]]; then
+
-		mkdir $IUPTEMP
+	mkdir -p $IUPTEMP
-	fi
 	touch $IUPCONFFILES
+
 	config_get_bool enabled "$config" enabled "$default"
 	config_get_bool defaultreset "$config" defaultreset
 	config_get deckey "$config" deckey
-	if [ "$enabled" -eq 1	]; then
+
+	if [ "$enabled" -ne "1" ]; then
+		return
+	fi
+
+	# get the url
 	if [ "$config" == "iup" ]; then
 		v "Using url received in dhcp options"
 		config_get url "$config" urliup
@@ -207,17 +209,17 @@ handle_provisioning() {
 	url=${url//\$MAC/$MAC}
 	v "Downloading from url \"$url\""
 
-		while [ $retry -le $RETRYSTOP ]
+	# download the file
-		do
+	while [ $retry -le $RETRYSTOP ]; do
 		if [ ${url%%:*} == "tftp" ]; then
 			tftpfile=${url#*\/\/}
 			host=${tftpfile%%\/*}
 			tftpfile=${tftpfile#*\/}
-
 			/usr/bin/tftp -l $IUPCONFFILES -r "$tftpfile" -g "$host"
 		else
 			get_image "$url" "cat" > $IUPCONFFILES
 		fi
+
 		if [ -s $IUPCONFFILES ]; then
 			v "Download finished"
 			retry=$((RETRYSTOP + 1))
@@ -228,20 +230,24 @@ handle_provisioning() {
 			retry=$((retry+1))
 		fi
 	done
-	fi
+
-	if [ ! -s "$IUPCONFFILES" ] && [ "$enabled" -eq 1 ]; then
+	if [ ! -s "$IUPCONFFILES" ] ; then
 		echo "File not Found"
 		reboot="off"
 		CONF=0
-	else
+		return
-		handle_Downloaded_file $deckey
 	fi
+
+	handle_Downloaded_file $deckey
 }
 
 handle_Downloaded_file()
 {
 	local DECKEY
 	local KEY
+	local md5
+	local pack
+	local packname
 	[ -n "$1" ] && DECKEY=$(echo $1 | tr -d '\n' | hexdump -e '16/1 "%02x"')
 	KEY=${DECKEY:-$DESKEY}
 	local img_type