@webprodigies/morphite 0.2.1 → 0.2.2

package/bin/morphite.mjs

@@ -282,10 +282,13 @@ async function main() {
   const destination = join(target, `${manifest.name}.app`)
   const work = await mkdtemp(join(tmpdir(), 'morphite-installer-'))
   const cleanup = () => rm(work, { recursive: true, force: true }).catch(() => undefined)
-  process.once('SIGINT', () => {
+  const stopped = () => {
     live.done()
+    note('Stopped. Nothing was changed.', `Run npx ${PACKAGE}@latest again when you’re ready.`)
+    say('')
     void cleanup().then(() => process.exit(130))
-  })
+  }
+  process.once('SIGINT', stopped)
   // A problem after the download started: keep the last line where it stopped, then say what happened.
   const stop = (title, detail) => {
     live.done()
@@ -317,15 +320,49 @@ async function main() {
       // Fetched by this program, the app carries no download mark; clear one defensively all the same.
       await run('/usr/bin/xattr', ['-dr', 'com.apple.quarantine', candidate]).catch(() => undefined)
 
-      // Morphite must be closed before its app is replaced; the person closes it, never this script.
+      // Morphite must be closed before its app is replaced. The person quits it from its menu, or
+      // presses Enter and the installer asks it to quit the normal way (never a forced stop, so its
+      // work ends cleanly). No keyboard shortcut is suggested: ⌘Q here would quit Terminal.
       let open = await runningFrom([...installed, ...earlier])
       if (open.length) {
         const names = open.map((app) => basename(app, '.app')).join(' and ')
-        live.set(`${bold(`Quit ${names} to continue`)} ${grey('(⌘Q)')}`)
-        while (open.length) {
-          await new Promise((resolve) => setTimeout(resolve, 700))
-          open = await runningFrom([...installed, ...earlier])
+        live.clear()
+        note(
+          `${names} is open.`,
+          `Quit it from its menu bar (${names} → Quit), and this ${current ? 'update' : 'install'} continues on its own.`,
+          tty ? 'Or press Return to quit it now. Control-C stops without changing anything.' : 'Control-C stops without changing anything.'
+        )
+        say('')
+        const input = tty && process.stdin.isTTY ? process.stdin : null
+        const key = (data) => {
+          const text = String(data)
+          if (text.includes('\u0003')) return stopped()
+          if (!/[\r\n]/.test(text)) return
+          live.set(grey(`Quitting ${names}…`))
+          for (const app of open) {
+            const id = earlier.includes(app) ? EARLIER_APP_ID : manifest.bundleId
+            void run('/usr/bin/osascript', ['-e', `tell application id ${JSON.stringify(id)} to quit`]).catch(() => undefined)
+          }
+        }
+        if (input) {
+          input.setRawMode(true)
+          input.resume()
+          input.on('data', key)
+        }
+        live.set(grey(`Waiting for ${names} to quit…`))
+        try {
+          while (open.length) {
+            await new Promise((resolve) => setTimeout(resolve, 700))
+            open = await runningFrom([...installed, ...earlier])
+          }
+        } finally {
+          if (input) {
+            input.off('data', key)
+            input.setRawMode(false)
+            input.pause()
+          }
         }
+        live.done(grey(`${names} quit`))
         live.set(grey(`${current ? 'Updating' : 'Installing'} in ${place}…`))
       }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webprodigies/morphite",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "Install or update Morphite on your Mac: npx @webprodigies/morphite",
   "type": "module",
   "bin": {