diff --git a/Gruntfile.js b/Gruntfile.js index b5a462bf7..190463d65 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -644,7 +644,7 @@ module.exports = function(grunt) { files: [ { cwd: "disks/pcx86/", - src: ["library.xml", "samples.xml", "private/library.xml"], + src: ["library.xml", "samples.xml", "shareware/pcsig08/pcsig08.xml", "private/library.xml"], dest: "disks/pcx86/compiled/", expand: true } @@ -671,10 +671,11 @@ module.exports = function(grunt) { var sFile = matchManifest[2]; var sManifest = grunt.file.read(path.join('.', sFile)); if (!sManifest) continue; - var sDefaultName = "", match; - match = sManifest.match(/(.*?)<\/title>/); + var sPrefix = "", sDefaultName = "Unknown", match; + match = sManifest.match(/]*>(.*?)<\/title>/); if (match) { - sDefaultName += match[1]; + sPrefix = match[1]; + sDefaultName = match[2]; match = sManifest.match(/(.*?)<\/version>/); if (match) sDefaultName += ' ' + match[1]; } @@ -688,7 +689,7 @@ module.exports = function(grunt) { while ((matchDisk = reDisk.exec(sManifest))) { if (sDisks) sDisks += "\n"; var matchName = matchDisk[2].match(/(.*?)<\/name>/); - var sName = matchName && matchName[1] || sDefaultName; + var sName = matchName? ((sPrefix? sPrefix + ": " : "") + matchName[1]) : sDefaultName; sDisks += matchManifest[1] + "" + sName + ""; } content = content.replace(matchManifest[0], sDisks); diff --git a/_posts/2015-12-27-revisiting-os2.md b/_posts/2015-12-27-revisiting-os2.md index 0a4a55e3c..7dcc67629 100644 --- a/_posts/2015-12-27-revisiting-os2.md +++ b/_posts/2015-12-27-revisiting-os2.md @@ -10,7 +10,7 @@ machines: debugger: true config: /devices/pcx86/machine/5170/ega/2048kb/rev3/debugger/machine.xml drives: '[{name:"20Mb Hard Disk",type:2,path:"/disks/pcx86/fixed/20mb/IBMOS210-EGA.json"}]' - automount: + autoMount: A: name: None B: diff --git a/_posts/2017-07-03-fantasyland.md b/_posts/2017-07-03-fantasyland.md index df037629e..92b31cd0a 100644 --- a/_posts/2017-07-03-fantasyland.md +++ b/_posts/2017-07-03-fantasyland.md @@ -10,7 +10,7 @@ machines: state: /apps/pcx86/1984/modula2/state.json config: /devices/pcx86/machine/5160/ega/640kb/debugger/machine.xml drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/MSDOS320-C400.json"}]' - automount: + autoMount: A: name: None B: diff --git a/apps/pcx86/1984/modula2/README.md b/apps/pcx86/1984/modula2/README.md index 8331c6c68..233bb72a6 100644 --- a/apps/pcx86/1984/modula2/README.md +++ b/apps/pcx86/1984/modula2/README.md @@ -9,7 +9,7 @@ machines: state: /apps/pcx86/1984/modula2/state.json config: /devices/pcx86/machine/5160/ega/640kb/machine.xml drives: '[{name:"10Mb Hard Disk",type:3,path:"/disks/pcx86/fixed/10mb/MSDOS320-C400.json"}]' - automount: + autoMount: A: name: None B: diff --git a/devices/pcx86/machine/5150/cga/256kb/machine.xml b/devices/pcx86/machine/5150/cga/256kb/machine.xml index aaad4f320..9d3d754b2 100644 --- a/devices/pcx86/machine/5150/cga/256kb/machine.xml +++ b/devices/pcx86/machine/5150/cga/256kb/machine.xml @@ -8,11 +8,11 @@