From bafe2ba183ceeb17cc6e53a1d6a1f3e539719847 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Sat, 27 Jul 2019 11:53:43 -0400
Subject: [PATCH] virtual-machines: make NeXT configs better through ini
 merging

---
 scripts/fish/macemu          |   1 +
 scripts/fish/nextemu         |   7 ++-
 virtual-machines/NeXT/2.2    |  75 ++++++++------------------
 virtual-machines/NeXT/common | 101 ++++++++++++++++++++++++++---------
 4 files changed, 103 insertions(+), 81 deletions(-)

diff --git a/scripts/fish/macemu b/scripts/fish/macemu
index 4bafc28..1607302 100644
--- a/scripts/fish/macemu
+++ b/scripts/fish/macemu
@@ -10,6 +10,7 @@ function macemu -d "Frontend to SheepShaver and BasiliskII" -a arch cfg
 			set executable SheepShaver
 	end
 
+	touch $config
 	chmod u+w $config
 
 	cat $_agw_dir_rc/virtual-machines/MacEmu/common        > $config
diff --git a/scripts/fish/nextemu b/scripts/fish/nextemu
index 02ae249..5b548a0 100644
--- a/scripts/fish/nextemu
+++ b/scripts/fish/nextemu
@@ -3,10 +3,13 @@
 function nextemu -d "Frontend to Previous" -a cfg
 	set config ~/.previous/previous.cfg
 
+	touch $config
 	chmod u+w $config
 
-	cat $_agw_dir_rc/virtual-machines/NeXT/common > $config
-	cat $_agw_dir_rc/virtual-machines/NeXT/$cfg  >> $config
+	$_agw_dir_scripts/merge-ini \
+		$_agw_dir_rc/virtual-machines/NeXT/common \
+		$_agw_dir_rc/virtual-machines/NeXT/$cfg \
+		$config
 
 	chmod -w $config
 
diff --git a/virtual-machines/NeXT/2.2 b/virtual-machines/NeXT/2.2
index d65def9..f7c9051 100644
--- a/virtual-machines/NeXT/2.2
+++ b/virtual-machines/NeXT/2.2
@@ -1,3 +1,6 @@
+[Screen]
+nMonitorType = 1
+
 [Memory]
 nMemoryBankSize0 = 16
 nMemoryBankSize1 = 16
@@ -8,69 +11,35 @@ nMemorySpeed = 1
 [HardDisk]
 szImageName0 = /mnt/s/vm/NeXT2.2/image
 nDeviceType0 = 1
-bDiskInserted0 = TRUE
-bWriteProtected0 = FALSE
+bDiskInserted0 = true
+bWriteProtected0 = false
 szImageName1 = /mnt/s/vm/NeXT2.2/boot
 nDeviceType1 = 3
-bDiskInserted1 = TRUE
-bWriteProtected1 = FALSE
+bDiskInserted1 = true
+bWriteProtected1 = false
 szImageName2 = /mnt/s/vm/NeXT2.2/install
 nDeviceType2 = 2
-bDiskInserted2 = TRUE
-bWriteProtected2 = FALSE
-szImageName3 =
-nDeviceType3 = 0
-bDiskInserted3 = FALSE
-bWriteProtected3 = FALSE
-szImageName4 =
-nDeviceType4 = 0
-bDiskInserted4 = FALSE
-bWriteProtected4 = FALSE
-szImageName5 =
-nDeviceType5 = 0
-bDiskInserted5 = FALSE
-bWriteProtected5 = FALSE
-szImageName6 =
-nDeviceType6 = 0
-bDiskInserted6 = FALSE
-bWriteProtected6 = FALSE
-nWriteProtection = 0
-
-[MagnetoOptical]
-szImageName0 =
-bDriveConnected0 = FALSE
-bDiskInserted0 = FALSE
-bWriteProtected0 = FALSE
-szImageName1 =
-bDriveConnected1 = FALSE
-bDiskInserted1 = FALSE
-bWriteProtected1 = FALSE
-
-[Floppy]
-szImageName0 =
-bDriveConnected0 = FALSE
-bDiskInserted0 = FALSE
-bWriteProtected0 = FALSE
-szImageName1 =
-bDriveConnected1 = FALSE
-bDiskInserted1 = FALSE
-bWriteProtected1 = FALSE
+bDiskInserted2 = true
+bWriteProtected2 = false
 
 [System]
 nMachineType = 1
-bColor = FALSE
-bTurbo = FALSE
-bNBIC = TRUE
-nSCSI = TRUE
-nRTC = FALSE
+bColor = false
+bTurbo = false
+bNBIC = true
+nSCSI = true
+nRTC = true
 nCpuLevel = 4
 nCpuFreq = 25
-bCompatibleCpu = TRUE
+bCompatibleCpu = true
 nDSPType = 2
-bDSPMemoryExpansion = TRUE
+bDSPMemoryExpansion = true
 n_FPUType = 68040
-bCompatibleFPU = TRUE
-bMMU = TRUE
+bCompatibleFPU = true
+bMMU = true
 
 [Dimension]
-bEnabled = FALSE
+bEnabled = false
+
+[Boot]
+nBootDevice = 1
diff --git a/virtual-machines/NeXT/common b/virtual-machines/NeXT/common
index 4012e90..0c87965 100644
--- a/virtual-machines/NeXT/common
+++ b/virtual-machines/NeXT/common
@@ -1,12 +1,12 @@
 [Log]
 sLogFileName = stderr
 sTraceFileName = stderr
-nTextLogLevel = 4
+nTextLogLevel = 0
 nAlertDlgLogLevel = 1
-bConfirmQuit = TRUE
+bConfirmQuit = false
 
 [ConfigDialog]
-bShowConfigDialogAtStartup = FALSE
+bShowConfigDialogAtStartup = false
 
 [Debugger]
 nNumberBase = 10
@@ -14,13 +14,12 @@ nDisasmLines = 8
 nMemdumpLines = 8
 
 [Screen]
-nMonitorType = 1
-bFullScreen = FALSE
-bShowStatusbar = TRUE
-bShowDriveLed = TRUE
+bFullScreen = false
+bShowStatusbar = true
+bShowDriveLed = true
 
 [Keyboard]
-bSwapCmdAlt = FALSE
+bSwapCmdAlt = false
 nKeymapType = 1
 szMappingFileName =
 
@@ -53,28 +52,27 @@ keyQuit = 0
 keyDimension = 0
 
 [Mouse]
-bEnableAutoGrab = TRUE
+bEnableAutoGrab = true
 fLinSpeedNormal = 1
 fLinSpeedLocked = 1
 fExpSpeedNormal = 1
 fExpSpeedLocked = 1
 
 [Sound]
-bEnableMicrophone = TRUE
-bEnableSound = TRUE
+bEnableMicrophone = true
+bEnableSound = true
 
 [Boot]
-nBootDevice = 0
-bEnableDRAMTest = FALSE
-bEnablePot = TRUE
-bEnableSoundTest = TRUE
-bEnableSCSITest = TRUE
-bLoopPot = FALSE
-bVerbose = TRUE
-bExtendedPot = FALSE
+bEnableDRAMTest = false
+bEnablePot = true
+bEnableSoundTest = true
+bEnableSCSITest = true
+bLoopPot = false
+bVerbose = true
+bExtendedPot = false
 
 [Printer]
-bPrinterConnected = FALSE
+bPrinterConnected = false
 nPaperSize = 0
 szPrintToFileName = /home/marrub/.previous/
 
@@ -84,12 +82,12 @@ szRom040FileName = /usr/share/previous/Rev_2.5_v66.BIN
 szRomTurboFileName = /usr/share/previous/Rev_3.3_v74.BIN
 
 [Ethernet]
-bEthernetConnected = FALSE
-bTwistedPair = FALSE
+bEthernetConnected = true
+bTwistedPair = true
 
 [Dimension]
-bI860Thread = TRUE
-bMainDisplay = FALSE
+bI860Thread = true
+bMainDisplay = false
 nMemoryBankSize0 = 4
 nMemoryBankSize1 = 4
 nMemoryBankSize2 = 4
@@ -97,5 +95,56 @@ nMemoryBankSize3 = 4
 szRomFileName = /usr/share/previous/dimension_eeprom.bin
 
 [System]
-bRealtime = TRUE
-bRealTimeClock = TRUE
+bRealtime = true
+bRealTimeClock = true
+
+[HardDisk]
+szImageName0 =
+nDeviceType0 = 0
+bDiskInserted0 = false
+bWriteProtected0 = false
+szImageName1 =
+nDeviceType1 = 0
+bDiskInserted1 = false
+bWriteProtected1 = false
+szImageName2 =
+nDeviceType2 = 0
+bDiskInserted2 = false
+bWriteProtected2 = false
+szImageName3 =
+nDeviceType3 = 0
+bDiskInserted3 = false
+bWriteProtected3 = false
+szImageName4 =
+nDeviceType4 = 0
+bDiskInserted4 = false
+bWriteProtected4 = false
+szImageName5 =
+nDeviceType5 = 0
+bDiskInserted5 = false
+bWriteProtected5 = false
+szImageName6 =
+nDeviceType6 = 0
+bDiskInserted6 = false
+bWriteProtected6 = false
+nWriteProtection = 0
+
+[MagnetoOptical]
+szImageName0 =
+bDriveConnected0 = false
+bDiskInserted0 = false
+bWriteProtected0 = false
+szImageName1 =
+bDriveConnected1 = false
+bDiskInserted1 = false
+bWriteProtected1 = false
+
+[Floppy]
+szImageName0 =
+bDriveConnected0 = false
+bDiskInserted0 = false
+bWriteProtected0 = false
+szImageName1 =
+bDriveConnected1 = false
+bDiskInserted1 = false
+bWriteProtected1 = false