Fix error messages in helper's tasks

helper/tasks/10ResizeUnmounted

@@ -10,7 +10,7 @@ set -e
 . /usr/share/snf-image/common.sh
 
 if [ ! -b "$SNF_IMAGE_DEV" ]; then
-    log_error "Device file:\`$SNF_IMAGE_DEV\' is not a block device"
+    log_error "Device file:\`${SNF_IMAGE_DEV}' is not a block device"
 
 fi
 if [ -z "$SNF_IMAGE_TYPE" ]; then

helper/tasks/30MountImage

@@ -9,12 +9,12 @@
 set -e
 . /usr/share/snf-image/common.sh
 
-if [ -z "$SNF_IMAGE_TARGET" ]; then
-    log_error "Target dir:\`$SNF_IMAGE_TARGET\' is missing"
+if [ ! -d "$SNF_IMAGE_TARGET" ]; then
+    log_error "Target dir:\`$SNF_IMAGE_TARGET' is missing"
 fi
 
 if [ ! -b "$SNF_IMAGE_DEV"]; then
-    log_error "Device file:\`$SNF_IMAGE_DEV\' is not a block device"
+    log_error "Device file:\`$SNF_IMAGE_DEV' is not a block device"
 fi
 
 mount $SNF_IMAGE_DEV $SNF_IMAGE_TARGET

helper/tasks/40AddDeleteUnattendScript

@@ -10,8 +10,8 @@
 set -e
 . /usr/share/snf-image/common.sh
 
-if [ -z "$SNF_IMAGE_TARGET" ]; then
-	log_error "Target dir is missing"	
+if [ ! -d "$SNF_IMAGE_TARGET" ]; then
+	log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing"	
 fi
 
 if [ "$SNF_IMAGE_TYPE" != "ntfsdump" ]; then

helper/tasks/40DeleteSSHKeys

@@ -9,6 +9,9 @@
 set -e
 . /usr/share/snf-image/common.sh
 
+if [ ! -d "$SNF_IMAGE_TARGET" ]; then
+    log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing."
+fi
 
 if [ "$SNF_IMAGE_TYPE" != "extdump" ]; then
     exit 0

helper/tasks/40InstallUnattend

@@ -11,7 +11,7 @@ set -e
 . /usr/share/snf-image/common.sh
 
 if [ -z "$SNF_IMAGE_TARGET" ]; then
-	log_error "Target dir is missing"	
+	log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing"	
 fi
 
 if [ "$SNF_IMAGE_TYPE" != "ntfsdump" ]; then

helper/tasks/40ResizeMounted

@@ -11,7 +11,7 @@ set -e
 . /usr/share/snf-image/common.sh
 
 if [ ! -d "$SNF_IMAGE_TARGET" ]; then
-    log_error "Target directory \`$SNF_IMAGE_TARGET\' is missing"
+    log_error "Target directory \`$SNF_IMAGE_TARGET' is missing"
 fi
 
 # Write a diskpart script to %SystemDrive%\Windows\SnfScripts. Sysprep will

helper/tasks/40SELinuxAutorelabel

@@ -10,8 +10,8 @@
 set -e
 . /usr/share/snf-image/common.sh
 
-if [ -z "$SNF_IMAGE_TARGET" ]; then
-	log_error "Target dir is missing"	
+if [ ! -d "$SNF_IMAGE_TARGET" ]; then
+	log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing"	
 fi
 
 if [ "$SNF_IMAGE_TYPE" != "extdump" ]; then

helper/tasks/50AssignHostname

@@ -54,8 +54,8 @@ linux_hostname() {
     sed -ie "s/^[[:blank:]]*127\.0\.1\.1[[:blank:]].\+$/127.0.1.1\t$hostname/" $target/etc/hosts
 }
 
-if [ -z "$SNF_IMAGE_TARGET" -o ! -d "$SNF_IMAGE_TARGET" ]; then
-    log_error "Missing target directory"	
+if [ ! -d "$SNF_IMAGE_TARGET" ]; then
+    log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing"	
 fi
 
 if [ -z "$SNF_IMAGE_HOSTNAME" ]; then
@@ -63,9 +63,9 @@ if [ -z "$SNF_IMAGE_HOSTNAME" ]; then
 fi
 
 if [ "$SNF_IMAGE_TYPE" = "ntfsdump" ]; then
-    windows_hostname $SNF_IMAGE_TARGET $SNF_IMAGE_PASSWORD
+    windows_hostname $SNF_IMAGE_TARGET $SNF_IMAGE_HOSTNAME
 elif [ "$SNF_IMAGE_TYPE" = "extdump" ]; then
-    linux_hostname $SNF_IMAGE_TARGET $SNF_IMAGE_PASSWORD
+    linux_hostname $SNF_IMAGE_TARGET $SNF_IMAGE_HOSTNAME
 fi
 
 echo "done"

helper/tasks/50ChangePassword

@@ -58,8 +58,8 @@ linux_password() {
     done
 }
 
-if [ -z "$SNF_IMAGE_TARGET" ]; then
-    log_error "Target dir is missing"	
+if [ ! -d "$SNF_IMAGE_TARGET" ]; then
+    log_error "Target dir: \`$SNF_IMAGE_TARGET' is missing"
 fi
 
 if [ -z "$SNF_IMAGE_PASSWORD" ]; then

helper/tasks/80UmountImage

@@ -10,8 +10,8 @@
 set -e
 . /usr/share/snf-image/common.sh
 
-if [ -z "$SNF_IMAGE_TARGET" ]; then
-	log_error "Target dir:\`$SNF_IMAGE_TARGET\' is missing"
+if [ ! -d "$SNF_IMAGE_TARGET" ]; then
+	log_error "Target dir:\`$SNF_IMAGE_TARGET' is missing"
 fi
 
 umount $SNF_IMAGE_TARGET