From fa09bd59f77923643ebfb0158ec01ca7ac9ff117 Mon Sep 17 00:00:00 2001
From: whiskerz007 <2713522+whiskerz007@users.noreply.github.com>
Date: Wed, 13 Mar 2019 17:29:33 +0100
Subject: [PATCH] Update install.sh

---
 install.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index 1da60c6..d0c6e4a 100644
--- a/install.sh
+++ b/install.sh
@@ -52,12 +52,14 @@ echo -e "\n\n\n" \
         "*       Creating new VM        *\n" \
         "********************************\n" && \
 VMDISK=vm-${VMID}-disk-
+VMDISK_EXT=`if [ "$STORAGE_TYPE" = "dir" ];then echo ".qcow2";fi`
+VMDISK_REF=`if [ "$STORAGE_TYPE" = "dir" ];then echo "${VMID}/";fi`${VMDISK}
 qm create $VMID -bios ovmf -name $(sed -e "s/\_//g" -e "s/.vdi.gz//" <<< $FILE) \
         -net0 virtio,bridge=vmbr0 -onboot 1 -ostype l26 -scsihw virtio-scsi-pci && \
-pvesm alloc $VM_STORAGE $VMID ${VMDISK}0$(if [ "$STORAGE_TYPE" = "dir" ];then echo "qcow2";fi) 128 1>&/dev/null && \
-qm importdisk $VMID ${FILE%".gz"} $VM_STORAGE 1>&/dev/null && \
-qm set $VMID -bootdisk sata0 -efidisk0 ${VM_STORAGE}:${VMDISK}0,size=128K \
-        -sata0 ${VM_STORAGE}:${VMDISK}1,size=6G > /dev/null && \
+pvesm alloc $VM_STORAGE $VMID ${VMDISK}0${VMDISK_EXT} 128 && \
+qm importdisk $VMID ${FILE%".gz"} $VM_STORAGE `if [ ! -z $VMDISK_EXT ];then echo "-format qcow2";fi`  && \
+qm set $VMID -bootdisk sata0 -efidisk0 ${VM_STORAGE}:${VMDISK_REF}0${VMDISK_EXT},size=128K \
+        -sata0 ${VM_STORAGE}:${VMDISK_REF}1${VMDISK_EXT},size=6G > /dev/null && \
 echo -e "\n\n\n" \
         "********************************\n" \
         "*    Completed Successfully    *\n" \