set image names globally independent of which stages are executed

Reduces duplication.

Changelog: None

Signed-off-by: Mirza Krak <mirza.krak@northern.tech>

mender-convert

@@ -266,21 +266,6 @@ do_raw_disk_image_create_partitions() {
   # Change current directory to 'output' directory.
   cd $output_dir
 
-  # Make sure the user's given Mender image name has a correct extension.
-  # If Mender image name is not provided, then use following syntax:
-  # mender-<device_name>-<artifact_name>.sdimg
-  if [ -n "${mender_disk_image}" ]; then
-    local mender_disk_basename=$(basename -- "$mender_disk_image")
-    if [[ $mender_disk_basename =~ \.sdimg$ ]]; then
-      mender_disk_image=$output_dir/$mender_disk_basename
-    else
-      local mender_disk_filename="${mender_disk_basename%.*}"
-      mender_disk_image=$output_dir/${mender_disk_filename}.sdimg
-    fi
-  else
-    mender_disk_image=$output_dir/mender-${device_type}-${artifact_name}.sdimg
-  fi
-
   set_mender_disk_alignment $device_type partition_alignment vfat_storage_offset
 
   get_raw_disk_sizes ${raw_disk_image} raw_disk_counts sector_size raw_disk_sizes
@@ -649,11 +634,6 @@ do_mender_disk_image_to_artifact() {
       rootfs_path=$sdimg_secondary_dir
     fi
 
-    local mender_disk_basename=$(basename -- "$mender_disk_image")
-    local mender_disk_filename="${mender_disk_basename%.*}"
-    local mender_rootfs_basename=${mender_disk_filename}.ext4
-    mender_rootfs_image=${output_dir}/$mender_rootfs_basename
-
     # Extract root filesystem ext4 image to use it to generate Mender artifact.
     # Ext4 disk image will be also verified in acceptance tests.
     extract_file_from_image $mender_disk_image $prootfs_start \
@@ -682,9 +662,6 @@ do_mender_disk_image_to_artifact() {
       sudo losetup -d $loopdevice
       rm -rf ${output_dir}/mnt
 
-      # Note: expected Mender Artifact name follows the scheme:
-      # mender-<device_name>-<artifact_name>.mender.
-      mender_artifact=${output_dir}/${mender_disk_filename}.mender
       log "\tWriting Mender artifact to: ${mender_artifact}"
 
       #Create Mender artifact
@@ -835,6 +812,26 @@ logsetup
 # Some commands expect elevated privileges.
 sudo true
 
+# Make sure the user's given Mender image name has a correct extension.
+# If Mender image name is not provided, then use following syntax:
+# mender-<device_name>-<artifact_name>.sdimg
+if [ -n "${mender_disk_image}" ]; then
+  mender_disk_filename=$(basename -- "$mender_disk_image")
+  if [[ $mender_disk_filename =~ \.sdimg$ ]]; then
+    mender_disk_image=$output_dir/${mender_disk_filename}
+  else
+    mender_disk_image=$output_dir/${mender_disk_filename}.sdimg
+  fi
+else
+  mender_disk_filename="mender-${device_type}-${artifact_name}"
+  mender_disk_image=$output_dir/${mender_disk_filename}.sdimg
+fi
+
+mender_disk_basename="${mender_disk_filename%.*}"
+mender_rootfs_basename=${mender_disk_basename}.ext4
+mender_rootfs_image=${output_dir}/${mender_rootfs_basename}
+mender_artifact=${output_dir}/${mender_disk_basename}.mender
+
 case "$1" in
   raw-disk-image-shrink-rootfs)
     total=1