use 7zr instead of 7z

Author: zuntrax

Makefile

@@ -24,12 +24,12 @@ pubkey=$(privkey).pub
 
 
 # Test for dependencies. Not sure if this is the right way to handle them.
-.PHONY: sshpass unzip 7z wget qemu-img qemu-system-x86_64
+.PHONY: sshpass unzip 7zr wget qemu-img qemu-system-x86_64
 sshpass:
 	@which $@ > /dev/null || bash -c 'echo "$@ not found, please install it" && false'
 unzip:
 	@which $@ > /dev/null || bash -c 'echo "$@ not found, please install it" && false'
-7z:
+7zr:
 	@which $@ > /dev/null || bash -c 'echo "$@ not found, please install it" && false'
 wget:
 	@which $@ > /dev/null || bash -c 'echo "$@ not found, please install it" && false'
@@ -83,8 +83,8 @@ $t:
 $t/helper.qcow2: | $t qemu-img
 	qemu-img create -f qcow2 $@ 1G
 
-$t/vm_default_host_key.pub: $d/win10.vmdk | $t 7z
-	7z e -so $^ 'Program Files/OpenSSH/etc/ssh_host_ecdsa_key.pub' > $@
+$t/vm_default_host_key.pub: $d/win10.vmdk | $t 7zr
+	7zr e -so $^ 'Program Files/OpenSSH/etc/ssh_host_ecdsa_key.pub' > $@
 
 
 # Initial preparations in the VM. Includes changing hostname, username, password, disabling updates and installing viostor drivers