v1.1.0

build(deps): Bump node-fetch from 2.6.0 to 2.6.1

.gitattributes

@@ -1 +1,2 @@
-* text eol=lf
+text eol=lf
+rom -text

.github/workflows/build.yml

@@ -3,7 +3,7 @@ name: Build & Release
 on:
   push:
     branches:
-    #  - master
+      - master
     tags:
       - v*
   pull_request:
@@ -63,6 +63,7 @@ jobs:
           MACOS_CERT_PASSWORD: ${{ secrets.MACOS_CERT_PASSWORD }}
       - name: Set Windows signing certificate
         if: matrix.os == 'windows-latest'
+        continue-on-error: true
         id: write_file
         uses: timheuer/base64-to-file@v1
         with:
@@ -82,18 +83,12 @@ jobs:
         run: yarn
       - name: Make
         if: startsWith(github.ref, 'refs/tags/')
-        run: yarn make
+        run: yarn make --arch=all
         env:
           APPLE_ID: ${{ secrets.APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
           WINDOWS_CODESIGN_FILE: ${{ steps.write_file.outputs.filePath }}
           WINDOWS_CODESIGN_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_PASSWORD }}
-      - name: Make (ia32)
-        if: matrix.os == 'windows-latest' && startsWith(github.ref, 'refs/tags/')
-        run: yarn make -- --arch=ia32
-        env:
-          WINDOWS_CODESIGN_FILE: ${{ steps.write_file.outputs.filePath }}
-          WINDOWS_CODESIGN_PASSWORD: ${{ secrets.WINDOWS_CODESIGN_PASSWORD }}
       # - name: Archive production artifacts
       #   uses: actions/upload-artifact@v2
       #   with:
@@ -105,6 +100,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
+          draft: true
           files: |
             out/**/*.deb
             out/**/*.dmg

README.md

@@ -8,8 +8,8 @@ This is Mac OS 8, running in an [Electron](https://electronjs.org/) app pretendi
 
 |  | Windows | macOS | Linux |
 |---------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Standalone Download | 📦[Standalone, 32-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.4/macintosh.js-win32-ia32-1.0.4.zip) <br /> 📦[Standalone, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.4/macintosh.js-win32-x64-1.0.4.zip)  | 📦[Standalone](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.4/macintosh.js-darwin-x64-1.0.4.zip) |  |
-| Installer | 💽[Setup, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.4/macintoshjs-1.0.4-setup-x64.exe) <br /> 💽[Setup, 32-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.4/macintoshjs-1.0.4-setup-ia32.exe)  |  |  💽[deb, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.4/macintosh.js_1.0.4_amd64.deb) <br /> 💽[rpm, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.4/macintosh.js-1.0.4-1.x86_64.rpm) |
+| Standalone Download | 📦[Standalone, 32-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintosh.js-win32-ia32-1.0.6.zip) <br /> 📦[Standalone, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintosh.js-win32-x64-1.0.6.zip)  | 📦[Standalone](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintosh.js-darwin-x64-1.0.6.zip) |  |
+| Installer | 💽[Setup, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintoshjs-1.0.6-setup-x64.exe) <br /> 💽[Setup, 32-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintoshjs-1.0.6-setup-ia32.exe)  |  |  💽[deb, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintosh.js_1.0.6_amd64.deb) <br /> 💽[rpm, 64-bit](https://github.com/felixrieseberg/macintosh.js/releases/download/v1.0.6/macintosh.js-1.0.6-1.x86_64.rpm) |
 
 ## Does it work?
 Yes! Quite well, actually - on macOS, Windows, and Linux. Bear in mind that this is written entirely in JavaScript, so please adjust your expectations. The virtual machine is emulating a 1991 Macintosh Quadra 900 with a Motorola CPU, which Apple used before switching to the PowerPC architecture (Apple/IBM/Motorola) in the mid 1990s.
@@ -36,7 +36,7 @@ Probably not. This is a toy - it's not the best nor the most performant way to e
 
 ## Credits
 
-Please check out the [CREDITS](CREDITS.md)! This app wouldn't be possible with the hard work of [Christian Bauer](https://www.cebix.net/) and [James Friend](https://jamesfriend.com.au/), who did everything that seems like computing magic here.
+Please check out the [CREDITS](CREDITS.md)! This app wouldn't be possible without the hard work of [Christian Bauer](https://www.cebix.net/) and [James Friend](https://jamesfriend.com.au/), who did everything that seems like computing magic here.
 
 ## License
 

package.json

@@ -1,7 +1,7 @@
 {
   "name": "macintosh.js",
   "productName": "macintosh.js",
-  "version": "1.0.5",
+  "version": "1.1.0",
   "description": "Macintosh's System 8 in an Electron app. I'm sorry.",
   "main": "src/main/index.js",
   "scripts": {
@@ -23,14 +23,14 @@
   },
   "dependencies": {
     "electron-squirrel-startup": "^1.0.0",
-    "update-electron-app": "^1.5.0"
+    "update-electron-app": "^2.0.1"
   },
   "devDependencies": {
-    "@electron-forge/cli": "6.0.0-beta.52",
-    "@electron-forge/maker-deb": "6.0.0-beta.52",
-    "@electron-forge/maker-rpm": "6.0.0-beta.52",
-    "@electron-forge/maker-squirrel": "6.0.0-beta.52",
-    "@electron-forge/maker-zip": "6.0.0-beta.52",
-    "electron": "10.0.0-beta.12"
+    "@electron-forge/cli": "6.0.0-beta.54",
+    "@electron-forge/maker-deb": "6.0.0-beta.54",
+    "@electron-forge/maker-rpm": "6.0.0-beta.54",
+    "@electron-forge/maker-squirrel": "6.0.0-beta.54",
+    "@electron-forge/maker-zip": "6.0.0-beta.54",
+    "electron": "11.1.1"
   }
 }

src/basilisk/BasiliskII-worker-boot.js

@@ -1,6 +1,5 @@
 const fs = require("fs");
 const path = require("path");
-const { error } = require("console");
 
 const homeDir = require("os").homedir();
 const macDir = path.join(homeDir, "macintosh.js");
@@ -13,6 +12,24 @@ function getUserDataDiskPath() {
   return path.join(userDataPath, "disk");
 }
 
+// File type utilities
+
+function isFile(v = "") {
+  return fs.statSync(path.join(macDir, v)).isFile();
+}
+
+function isHiddenFile(filename = '') {
+  return filename.startsWith('.');
+}
+
+function isCDImage(filename = '') {
+  return filename.endsWith('.iso') || filename.endsWith('.toast');
+}
+
+function isDiskImage(filename = '') {
+  return filename.endsWith('.img') || filename.endsWith('.dsk');
+}
+
 function cleanupCopyPath() {
   try {
     if (fs.existsSync(macintoshCopyPath)) {
@@ -60,7 +77,7 @@ function preloadFilesAtPath(module, initalSourcePath) {
     }`;
     const files = fs.readdirSync(sourcePath).filter((v) => {
       // Remove hidden, iso, and img files
-      return !v.startsWith(".") && !v.endsWith(".iso") && !v.endsWith(".img");
+      return !isHiddenFile(v) && !isDiskImage(v) && !isCDImage(v);
     });
 
     (files || []).forEach((fileName) => {
@@ -192,9 +209,9 @@ function writePrefs(userImages = []) {
     if (userImages && userImages.length > 0) {
       console.log(`writePrefs: Found ${userImages.length} user images`);
       userImages.forEach(({ name }) => {
-        if (name.endsWith(".iso")) {
+        if (isCDImage(name)) {
           prefs += `\ncdrom ${name}`;
-        } else if (name.endsWith(".img")) {
+        } else if (isDiskImage(name)) {
           prefs += `\ndisk ${name}`;
         }
       });
@@ -208,14 +225,6 @@ function writePrefs(userImages = []) {
   }
 }
 
-function isMacDirFileOfType(extension = "", v = "") {
-  const isType = v.endsWith(`.${extension}`);
-  const isMatch = isType && fs.statSync(path.join(macDir, v)).isFile();
-
-  console.log(`isMacDirFileOfType: ${v} is file and ${extension}: ${isMatch}`);
-  return isMatch;
-}
-
 function getUserImages() {
   const result = [];
 
@@ -227,8 +236,8 @@ function getUserImages() {
     }
 
     const macDirFiles = fs.readdirSync(macDir);
-    const imgFiles = macDirFiles.filter((v) => isMacDirFileOfType("img", v));
-    const isoFiles = macDirFiles.filter((v) => isMacDirFileOfType("iso", v));
+    const imgFiles = macDirFiles.filter((v) => isFile(v) && isDiskImage(v));
+    const isoFiles = macDirFiles.filter((v) => isFile(v) && isCDImage(v));
     const isoImgFiles = [...isoFiles, ...imgFiles];
 
     console.log(`getUserImages: iso and img files`, isoImgFiles);