From f0d18e3d1b1eb55447292f6c4d997dd31b8e3fb4 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Thu, 7 Nov 2019 07:17:01 -0500
Subject: [PATCH] virtual-machines: move vm-qemu into its actual function

---
 fish/vm-qemu                  | 78 ++++++++++++++++++++++++++++++++-
 virtual-machines/QEMU/vm-qemu | 81 -----------------------------------
 2 files changed, 77 insertions(+), 82 deletions(-)
 delete mode 100755 virtual-machines/QEMU/vm-qemu

diff --git a/fish/vm-qemu b/fish/vm-qemu
index dd7f758..89ccc9b 100644
--- a/fish/vm-qemu
+++ b/fish/vm-qemu
@@ -1,7 +1,83 @@
 #!/usr/bin/env fish
 
 function vm-qemu -d "Frontend to QEMU"
-	$_agw_dir_rc/virtual-machines/QEMU/vm-qemu $argv
+	# Args
+	argparse \
+		--name "vm-qemu" \
+		--min-args 1 \
+		'V/version=' \
+		'i/install' \
+		-- \
+		$argv
+	or exit 1
+
+	set cfg $argv[1]
+	set -e argv[1]
+
+	# Config
+	source $_agw_dir_rc/virtual-machines/QEMU/$cfg
+
+	# Devices
+	test "$_vga"
+	and set vga $_vga
+	or  set vga vmware
+
+	test "$_soundhw"
+	and set soundhw $_soundhw
+	or  set soundhw hda
+
+	for dev in $_devs
+		set -a _args --device $dev
+	end
+
+	# Machine
+	test "$_cpu"
+	and set cpu $_cpu
+	or  set cpu host
+
+	if test "$_arch" = "i386" || test "$_arch" = "x86_64"
+		set -p _args \
+			--machine accel=kvm \
+			--usb
+	end
+
+	# Versioning
+	test "$_flag_version"
+	and set ver $_flag_version
+	or  set ver $_ver
+
+	# Disk Media
+	set image "/media/store/vm/$cfg/image$ver"
+	set boot_order c
+
+	# Install Media
+	set media   "/media/store/osmedia"
+	set install (string replace "_ver_" "$ver" "$_install")
+	set boot    (string replace "_ver_" "$ver" "$_boot")
+
+	if test "$_flag_install"
+		set boot_order d
+		set -p _args --drive file="$media/$install",media=cdrom,readonly
+
+		if test "$boot"
+			set boot_order a
+			set -p _args --drive file="$media/$boot",format=raw,if=floppy,readonly
+		end
+	end
+
+	# Run!
+	set -a _args $argv
+
+	env QEMU_AUDIO_DRV=pa "qemu-system-$_arch" \
+		--boot order="$boot_order" \
+		--cpu "$cpu" \
+		--display sdl,gl=on \
+		--drive file="$image",format=qcow2,media=disk \
+		--monitor stdio \
+		--soundhw "$soundhw" \
+		--vga "$vga" \
+		-m "$_mem" \
+		$_args
 end
 
 complete -c vm-qemu -xa "(ls $_agw_dir_rc/virtual-machines/QEMU)"
diff --git a/virtual-machines/QEMU/vm-qemu b/virtual-machines/QEMU/vm-qemu
deleted file mode 100755
index 0409e93..0000000
--- a/virtual-machines/QEMU/vm-qemu
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env fish
-
-# Args
-argparse \
-	--name "vm-qemu" \
-	--min-args 1 \
-	'V/version=' \
-	'i/install' \
-	-- \
-	$argv
-or exit 1
-
-set cfg $argv[1]
-set -e argv[1]
-
-# Config
-source $_agw_dir_rc/virtual-machines/QEMU/$cfg
-
-# Devices
-test "$_vga"
-and set vga $_vga
-or  set vga vmware
-
-test "$_soundhw"
-and set soundhw $_soundhw
-or  set soundhw hda
-
-for dev in $_devs
-	set -a _args --device $dev
-end
-
-# Machine
-test "$_cpu"
-and set cpu $_cpu
-or  set cpu host
-
-if test "$_arch" = "i386" || test "$_arch" = "x86_64"
-	set -p _args \
-		--machine accel=kvm \
-		--usb
-end
-
-# Versioning
-test "$_flag_version"
-and set ver $_flag_version
-or  set ver $_ver
-
-# Disk Media
-set image "/media/store/vm/$cfg/image$ver"
-set boot_order c
-
-# Install Media
-set media   "/media/store/osmedia"
-set install (string replace "_ver_" "$ver" "$_install")
-set boot    (string replace "_ver_" "$ver" "$_boot")
-
-if test "$_flag_install"
-	set boot_order d
-	set -p _args --drive file="$media/$install",media=cdrom,readonly
-
-	if test "$boot"
-		set boot_order a
-		set -p _args --drive file="$media/$boot",format=raw,if=floppy,readonly
-	end
-end
-
-# Run!
-set -a _args $argv
-
-env QEMU_AUDIO_DRV=pa "qemu-system-$_arch" \
-	--boot order="$boot_order" \
-	--cpu "$cpu" \
-	--display sdl,gl=on \
-	--drive file="$image",format=qcow2,media=disk \
-	--monitor stdio \
-	--soundhw "$soundhw" \
-	--vga "$vga" \
-	-m "$_mem" \
-	$_args
-
-## EOF