From 4400af6f816ef09625fb3c1a922601521b085678 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Thu, 15 Aug 2019 23:37:48 -0400
Subject: [PATCH] virtual-machines: make run scripts not require a folder

---
 scripts/fish/vm-qemu                      | 2 +-
 virtual-machines/{NetBSD/run => NetBSD}   | 0
 virtual-machines/{Void/run => Void}       | 2 +-
 virtual-machines/{Win2000/run => Win2000} | 0
 virtual-machines/{Win98/run => Win98}     | 0
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename virtual-machines/{NetBSD/run => NetBSD} (100%)
 rename virtual-machines/{Void/run => Void} (59%)
 rename virtual-machines/{Win2000/run => Win2000} (100%)
 rename virtual-machines/{Win98/run => Win98} (100%)

diff --git a/scripts/fish/vm-qemu b/scripts/fish/vm-qemu
index 9121088..983f675 100644
--- a/scripts/fish/vm-qemu
+++ b/scripts/fish/vm-qemu
@@ -8,7 +8,7 @@ function vm-qemu -d "Frontend to QEMU"
 		_vm_media="/mnt/s/osmedia" \
 		_vm_setup="$_agw_dir_rc/virtual-machines/qemu-setup" \
 		_vm_args="$argv" \
-		$_agw_dir_rc/virtual-machines/$cfg/run
+		$_agw_dir_rc/virtual-machines/$cfg
 end
 
 complete -c vm-qemu -xa "(ls $_agw_dir_rc/virtual-machines)"
diff --git a/virtual-machines/NetBSD/run b/virtual-machines/NetBSD
similarity index 100%
rename from virtual-machines/NetBSD/run
rename to virtual-machines/NetBSD
diff --git a/virtual-machines/Void/run b/virtual-machines/Void
similarity index 59%
rename from virtual-machines/Void/run
rename to virtual-machines/Void
index 87482b9..4cb9dd0 100755
--- a/virtual-machines/Void/run
+++ b/virtual-machines/Void
@@ -2,7 +2,7 @@
 # vim: syntax=fish:
 
 set _arch x86_64
-set _install "$_vm_media/Linux/Void Linux/void-live-x86_64-musl-20181111.iso"
+set _install "$_vm_media/Linux/Void/live-x86_64-musl-20181111.iso"
 set _args \
 	-m 2048 \
 	--usb
diff --git a/virtual-machines/Win2000/run b/virtual-machines/Win2000
similarity index 100%
rename from virtual-machines/Win2000/run
rename to virtual-machines/Win2000
diff --git a/virtual-machines/Win98/run b/virtual-machines/Win98
similarity index 100%
rename from virtual-machines/Win98/run
rename to virtual-machines/Win98