From 0380ea00f311f8110bf5e73cf181d306817cf864 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Sat, 27 Jul 2019 10:24:43 -0400
Subject: [PATCH] virtual-machines: use a better file structure

---
 copy-files                                                  | 4 +++-
 scripts/fish/macemu                                         | 6 +++---
 virtual-machines/{MacEmu-OS7 => MacEmu/OS7}                 | 0
 virtual-machines/{MacEmu-OS9 => MacEmu/OS9}                 | 0
 virtual-machines/{MacEmu-common => MacEmu/common}           | 0
 virtual-machines/{MacEmu-common-m68k => MacEmu/common-m68k} | 0
 virtual-machines/{MacEmu-common-ppc => MacEmu/common-ppc}   | 0
 virtual-machines/{NeXT2.2-config => NeXT2.2/config}         | 0
 virtual-machines/{Win2000-run => Win2000/run}               | 0
 virtual-machines/{Win98-run => Win98/run}                   | 0
 10 files changed, 6 insertions(+), 4 deletions(-)
 rename virtual-machines/{MacEmu-OS7 => MacEmu/OS7} (100%)
 rename virtual-machines/{MacEmu-OS9 => MacEmu/OS9} (100%)
 rename virtual-machines/{MacEmu-common => MacEmu/common} (100%)
 rename virtual-machines/{MacEmu-common-m68k => MacEmu/common-m68k} (100%)
 rename virtual-machines/{MacEmu-common-ppc => MacEmu/common-ppc} (100%)
 rename virtual-machines/{NeXT2.2-config => NeXT2.2/config} (100%)
 rename virtual-machines/{Win2000-run => Win2000/run} (100%)
 rename virtual-machines/{Win98-run => Win98/run} (100%)

diff --git a/copy-files b/copy-files
index dfcb037..df9eb71 100755
--- a/copy-files
+++ b/copy-files
@@ -43,9 +43,11 @@ function copyvmfile
 	set fna $argv[2]
 
 	set file "$dir/$fna"
+	set dirn "virtual-machines/"(basename "$dir")
 
 	if test -f "$file"
-		cp "$file" virtual-machines/(basename "$dir")-$fna
+		mkdir -p "$dirn"
+		cp "$file" "$dirn/$fna"
 	end
 end
 
diff --git a/scripts/fish/macemu b/scripts/fish/macemu
index 67fc399..4bafc28 100644
--- a/scripts/fish/macemu
+++ b/scripts/fish/macemu
@@ -12,9 +12,9 @@ function macemu -d "Frontend to SheepShaver and BasiliskII" -a arch cfg
 
 	chmod u+w $config
 
-	cat $_agw_dir_rc/virtual-machines/MacEmu-common        > $config
-	cat $_agw_dir_rc/virtual-machines/MacEmu-common-$arch >> $config
-	cat $_agw_dir_rc/virtual-machines/MacEmu-$cfg         >> $config
+	cat $_agw_dir_rc/virtual-machines/MacEmu/common        > $config
+	cat $_agw_dir_rc/virtual-machines/MacEmu/common-$arch >> $config
+	cat $_agw_dir_rc/virtual-machines/MacEmu/$cfg         >> $config
 
 	chmod -w $config
 
diff --git a/virtual-machines/MacEmu-OS7 b/virtual-machines/MacEmu/OS7
similarity index 100%
rename from virtual-machines/MacEmu-OS7
rename to virtual-machines/MacEmu/OS7
diff --git a/virtual-machines/MacEmu-OS9 b/virtual-machines/MacEmu/OS9
similarity index 100%
rename from virtual-machines/MacEmu-OS9
rename to virtual-machines/MacEmu/OS9
diff --git a/virtual-machines/MacEmu-common b/virtual-machines/MacEmu/common
similarity index 100%
rename from virtual-machines/MacEmu-common
rename to virtual-machines/MacEmu/common
diff --git a/virtual-machines/MacEmu-common-m68k b/virtual-machines/MacEmu/common-m68k
similarity index 100%
rename from virtual-machines/MacEmu-common-m68k
rename to virtual-machines/MacEmu/common-m68k
diff --git a/virtual-machines/MacEmu-common-ppc b/virtual-machines/MacEmu/common-ppc
similarity index 100%
rename from virtual-machines/MacEmu-common-ppc
rename to virtual-machines/MacEmu/common-ppc
diff --git a/virtual-machines/NeXT2.2-config b/virtual-machines/NeXT2.2/config
similarity index 100%
rename from virtual-machines/NeXT2.2-config
rename to virtual-machines/NeXT2.2/config
diff --git a/virtual-machines/Win2000-run b/virtual-machines/Win2000/run
similarity index 100%
rename from virtual-machines/Win2000-run
rename to virtual-machines/Win2000/run
diff --git a/virtual-machines/Win98-run b/virtual-machines/Win98/run
similarity index 100%
rename from virtual-machines/Win98-run
rename to virtual-machines/Win98/run