From dbb3174cbcea9d646ff2b2ba67b4b5e47909cb9b Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Thu, 27 Jul 2023 10:53:38 -0400
Subject: [PATCH] app: fix #218 and keep dock open on install

---
 app/src/app.tsx    | 7 ++++++-
 app/src/index.ts   | 9 +++++----
 app/src/install.ts | 2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/app/src/app.tsx b/app/src/app.tsx
index ee16212a..3d14338b 100644
--- a/app/src/app.tsx
+++ b/app/src/app.tsx
@@ -2,7 +2,7 @@ import { useState } from 'react'
 import copy from 'copy-to-clipboard'
 import { CheckIcon, DocumentDuplicateIcon } from '@heroicons/react/24/outline'
 import Store from 'electron-store'
-import { getCurrentWindow } from '@electron/remote'
+import { getCurrentWindow, app } from '@electron/remote'
 
 import { install } from './install'
 import OllamaIcon from './ollama.svg'
@@ -107,6 +107,11 @@ export default function () {
               <button
                 onClick={() => {
                   store.set('first-time-run', true)
+
+                  if (process.platform === 'darwin') {
+                    app.dock.hide()
+                  }
+
                   window.close()
                 }}
                 className='no-drag rounded-dm mx-auto w-[60%] rounded-md bg-black px-4 py-2 text-sm text-white hover:brightness-110'
diff --git a/app/src/index.ts b/app/src/index.ts
index eed950d5..deb75124 100644
--- a/app/src/index.ts
+++ b/app/src/index.ts
@@ -36,6 +36,7 @@ app.on('ready', () => {
   const gotTheLock = app.requestSingleInstanceLock()
   if (!gotTheLock) {
     app.exit(0)
+    return
   }
 
   app.on('second-instance', () => {
@@ -56,10 +57,6 @@ app.on('ready', () => {
   init()
 })
 
-if (process.platform === 'darwin') {
-  app.dock.hide()
-}
-
 function firstRunWindow() {
   // Create the browser window.
   welcomeWindow = new BrowserWindow({
@@ -198,6 +195,10 @@ function init() {
   server()
 
   if (store.get('first-time-run') && installed()) {
+    if (process.platform === 'darwin') {
+      app.dock.hide()
+    }
+
     app.setLoginItemSettings({ openAtLogin: app.getLoginItemSettings().openAtLogin })
     return
   }
diff --git a/app/src/install.ts b/app/src/install.ts
index 24f2a715..d8036542 100644
--- a/app/src/install.ts
+++ b/app/src/install.ts
@@ -15,7 +15,7 @@ export function installed() {
 export async function install() {
   const command = `do shell script "mkdir -p ${path.dirname(
     symlinkPath
-  )} && ln -F -s ${ollama} ${symlinkPath}" with administrator privileges`
+  )} && ln -F -s \\"${ollama}\\" \\"${symlinkPath}\\"" with administrator privileges`
 
   await exec(`osascript -e '${command}'`)
 }