From 776e7bb5e4630ba6d22bd4ab77a0f90763a446c1 Mon Sep 17 00:00:00 2001
From: jmorganca <jmorganca@gmail.com>
Date: Sat, 27 Apr 2024 15:57:57 -0400
Subject: [PATCH] app: fix status item icons

---
 app/AppDelegate.m                             |  79 ++++-----------
 app/app_darwin.go                             |   9 +-
 app/app_darwin.m                              |   2 +-
 app/app_windows.go                            |   8 +-
 .../Ollama.app/Contents/Resources/icon.png    | Bin 363 -> 382 bytes
 .../Ollama.app/Contents/Resources/icon@2x.png | Bin 668 -> 691 bytes
 .../Contents/Resources/iconDark.png           | Bin 381 -> 382 bytes
 .../Contents/Resources/iconDark@2x.png        | Bin 768 -> 721 bytes
 app/lifecycle/lifecycle.go                    |  92 ------------------
 app/{server_unix.go => server_darwin.go}      |   2 -
 scripts/publish.sh                            |  25 -----
 scripts/run_darwin.sh                         |   1 +
 12 files changed, 31 insertions(+), 187 deletions(-)
 delete mode 100644 app/lifecycle/lifecycle.go
 rename app/{server_unix.go => server_darwin.go} (96%)
 delete mode 100755 scripts/publish.sh

diff --git a/app/AppDelegate.m b/app/AppDelegate.m
index 16bc9202..009bd3aa 100644
--- a/app/AppDelegate.m
+++ b/app/AppDelegate.m
@@ -22,24 +22,33 @@
     // user about what this is doing, and ideally use Touch ID.
     // or add an alias in the current shell environment,
     // which wouldn't require any special privileges
-    dispatch_async(dispatch_get_main_queue(), ^{ 
-        createSymlinkWithAuthorization();
-    });
+    // dispatch_async(dispatch_get_main_queue(), ^{
+    //     createSymlinkWithAuthorization();
+    // });
 
     // show status menu
     NSMenu *menu = [[NSMenu alloc] init];
-
-    NSMenuItem *openSettingsItem = [[NSMenuItem alloc] initWithTitle:@"Settings..." action:@selector(openSettingsWindow) keyEquivalent:@""];
-    [menu addItem:openSettingsItem];
-    [menu addItem:[NSMenuItem separatorItem]];
     [menu addItemWithTitle:@"Quit Ollama" action:@selector(quit) keyEquivalent:@"q"];
     self.statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength];
+    [self.statusItem addObserver:self forKeyPath:@"button.effectiveAppearance" options:NSKeyValueObservingOptionNew|NSKeyValueObservingOptionInitial context:nil];
+
     self.statusItem.menu = menu;
-    NSImage *statusImage = [NSImage imageNamed:@"icon"];
+    [self showIcon];
+}
+
+-(void) showIcon {
+    NSAppearance* appearance = self.statusItem.button.effectiveAppearance;
+    NSString* appearanceName = (NSString*)(appearance.name);
+    NSString* iconName = [[appearanceName lowercaseString] containsString:@"dark"] ? @"iconDark" : @"icon";
+    NSImage* statusImage = [NSImage imageNamed:iconName];
     [statusImage setTemplate:YES];
     self.statusItem.button.image = statusImage;
 }
 
+-(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary<NSKeyValueChangeKey,id> *)change context:(void *)context {
+    [self showIcon];
+}
+
 - (void)openSettingsWindow {
     if (!self.settingsWindow) {
         // Create the settings window centered on the screen
@@ -66,57 +75,8 @@
     }
 }
 
-#pragma mark - NSToolbarDelegate
-
-- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSToolbarItemIdentifier)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag {
-    NSToolbarItem *toolbarItem = [[NSToolbarItem alloc] initWithItemIdentifier:itemIdentifier];
-
-    if ([itemIdentifier isEqualToString:@"General"]) {
-        toolbarItem.label = @"General";
-        toolbarItem.paletteLabel = @"General";
-        toolbarItem.toolTip = @"General Settings";
-        toolbarItem.image = [NSImage imageWithSystemSymbolName:@"gear" accessibilityDescription:nil]; // Monochrome symbol
-        toolbarItem.target = self;
-        toolbarItem.action = @selector(switchTabs:);
-    }
-
-    if ([itemIdentifier isEqualToString:@"Networking"]) {
-        toolbarItem.label = @"Networking";
-        toolbarItem.paletteLabel = @"Networking";
-        toolbarItem.toolTip = @"Networking Settings";
-        toolbarItem.image = [NSImage imageWithSystemSymbolName:@"network" accessibilityDescription:nil]; // Monochrome symbol
-        toolbarItem.target = self;
-        toolbarItem.action = @selector(switchTabs:);
-    }
-    // Create other items with their respective images and selectors here...
-
-    return toolbarItem;
-}
-
-- (NSArray<NSToolbarItemIdentifier> *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar {
-    return @[
-        NSToolbarFlexibleSpaceItemIdentifier, 
-        @"General",
-        @"Networking",
-        NSToolbarFlexibleSpaceItemIdentifier
-    ];
-}
-
-- (NSArray<NSToolbarItemIdentifier> *)toolbarDefaultItemIdentifiers:(NSToolbar *)toolbar {
-    return @[
-        NSToolbarFlexibleSpaceItemIdentifier, 
-        @"General", 
-        @"Networking",
-        NSToolbarFlexibleSpaceItemIdentifier
-    ];
-}
-
-- (void)switchTabs:(NSToolbarItem *)sender {
-    // Your code to switch tabs based on the sender's identifier
-}
-
 - (void)quit {
-    Quit();
+    [NSApp stop:nil];
 }
 
 @end
@@ -132,12 +92,13 @@ int askToMoveToApplications() {
     [alert setInformativeText:@"Ollama works best when run from the Applications directory."];
     [alert addButtonWithTitle:@"Move to Applications"];
     [alert addButtonWithTitle:@"Don't move"];
-    
+
     [NSApp activateIgnoringOtherApps:YES];
 
     if ([alert runModal] != NSAlertFirstButtonReturn) {
         return 0;
     }
+
     // move to applications
     NSString *applicationsPath = @"/Applications";
     NSString *newPath = [applicationsPath stringByAppendingPathComponent:@"Ollama.app"];
diff --git a/app/app_darwin.go b/app/app_darwin.go
index bf264038..2f6e5dbb 100644
--- a/app/app_darwin.go
+++ b/app/app_darwin.go
@@ -33,21 +33,22 @@ func run() {
 		panic(err)
 	}
 
-	resources := filepath.Join(filepath.Dir(exe), "..", "Resources")
-
 	ctx, cancel := context.WithCancel(context.Background())
 	var done chan int
 
-	done, err = SpawnServer(ctx, filepath.Join(resources, "ollama"))
+	done, err = SpawnServer(ctx, filepath.Join(filepath.Dir(exe), "..", "Resources", "ollama"))
 	if err != nil {
 		slog.Error(fmt.Sprintf("Failed to spawn ollama server %s", err))
 		done = make(chan int, 1)
 		done <- 1
 	}
 
-	// Run the native app
+	// Run the native macOS app
+	// Note: this will block until the app is closed
 	C.run()
 
+	slog.Info("ollama macOS app closed")
+
 	cancel()
 	slog.Info("Waiting for ollama server to shutdown...")
 	if done != nil {
diff --git a/app/app_darwin.m b/app/app_darwin.m
index c2366af7..34ce69d1 100644
--- a/app/app_darwin.m
+++ b/app/app_darwin.m
@@ -38,4 +38,4 @@ void killOtherInstances() {
             [[NSRunLoop currentRunLoop] runUntilDate:[NSDate dateWithTimeIntervalSinceNow:0.1]];
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/app_windows.go b/app/app_windows.go
index b4b84ced..91ff04ab 100644
--- a/app/app_windows.go
+++ b/app/app_windows.go
@@ -13,10 +13,10 @@ import (
 	"strings"
 	"syscall"
 
-	"github.com/jmorganca/ollama/app/lifecycle"
-	"github.com/jmorganca/ollama/app/store"
-	"github.com/jmorganca/ollama/app/tray"
-	"github.com/jmorganca/ollama/app/updater"
+	"github.com/ollama/ollama/app/lifecycle"
+	"github.com/ollama/ollama/app/store"
+	"github.com/ollama/ollama/app/tray"
+	"github.com/ollama/ollama/app/updater"
 )
 
 func init() {
diff --git a/app/darwin/Ollama.app/Contents/Resources/icon.png b/app/darwin/Ollama.app/Contents/Resources/icon.png
index 1e826e037c63192ad208b14de39c2b2036664170..385972c2034b4b10989e3e5cd0505b2cf28fe1f4 100644
GIT binary patch
delta 340
zcmV-a0jvJ&0{#LaiBL{Q4GJ0x0000DNk~Le0000G0000H2nGNE0MxH6#E~I2e-lYW
zK~#7Fjg!5V!Y~ko=YI0zvI}(?*|~)40EcAI0dznM&;ev*Km~>hfQ-yg0gw^0`!s@m
zLN?5MU!eVyJd%M&bp@A*XUx?~3kqSK$d!!$+u&znmyyt6VaE7L*a~AI7nY&nJsQwp
z@mZL0tr`eN=Dtv)84DF>;*PPBe>F*U;lHtgYB|>AspJ}I_hYFqMOau9b>}_&_pXFL
zcq0$+$6v8|XgB&W19BFtflc8}SO`1emo*nQYkm?B_!fTPud2z$6Pp54q0Nn!h*aQy
z@8D4tb-i!m4#oqk67@F_q&2sfY9G=jIzg4R=8zhoF6S={=)wE+FhH+uDvsw;_gkp}
m;Xin$Jt`hthSyDWVQ~eZraL@Ppp-%Y0000<MNUMnLSTa65t7XS

delta 321
zcmV-H0lxnJ0_y@HiBL{Q4GJ0x0000DNk~Le0000F0000G2nGNE0LfM*1d$;%e*j5D
zK~#7Fl~KD9f<O@6Q3Eru14^I-N-#8}1Urz>3`(E_F*3vszzVnyAajg#Z+y!g2g0~B
zZ*G6@_D3|76XVU;JAQ4qh)+rYV$LX?SjD&?9!!xV{2n4H1tEp4;|(Jg!pf=KflPQG
zRwZrw$Qg;utC2ae1YJo-qn4$$e>suG4f1rQ0=iFTjEGFz;?I#!Yd8*!Cu7IBF}92&
zhzW>i#tXW~xJu=i%%-*8AgP3}Ldy|Z8<%Z&WHwnq_wl=eerMFs75$i*&~k;!4Qz5}
z-dN7o`79%Id;7MYWA~>DX<h=dPAW4iyxjuXw+$i3^j(NrAlJx?Z1O+S7kBpoq{v1P
TfKPg_00000NkvXXu0mjf?aYN?

diff --git a/app/darwin/Ollama.app/Contents/Resources/icon@2x.png b/app/darwin/Ollama.app/Contents/Resources/icon@2x.png
index 5f8e6451f30be134db0e44520bef55383bd830b8..77fd58b85d5a274e904d73dddfd2aff524125f6b 100644
GIT binary patch
delta 630
zcmV-+0*U>c1+xW^7YZQ=1^@s6xF)Glks&pINJ&INRCoc!nBh_DFbv24ulK&cZ1Btm
zVFJtqlnufL-GFQWOhDNHCTKTEI{{^alnF|7NU@sQiIQ^1?@s5WwiMZxB?B-_)=18+
z6&maD1Gq-s8#!>B8+B@><8TJgZ0Mj24j~SU6VI4Praqi2gT6<{<9O!cNOJpTJ;r2z
zxi>5?{61F>dX`K%K&%_tv0jFrt^12Kj@u9A2yxZO3a2ZvR?lzTZu#R56C4m~Zg<?u
zZ1()y9$_V*`b^A>;~c(cE<81I(a2>Z*ZlmX`g7P$OfR(8hlrFtI%Pt~V<Z$fD`kMT
z;hldQqT;c&(yuTsk>LU1IC)H`K*$S!=6v80Ja;%B2U`wlk?c1)gGDIE*sKt;-w+vW
zdz-_a%G>4F%A|O&K1$Cz$f*AT!5QkW5GIjD>?RSzj^CF!jtL!91<O)7lHs%v$qLjk
zu)^_q_dJ^g8>|s#=GC(ltVbS8I#M?ZwrM%W?I|E*uG3c|J}X)JN1V>mA*@J$(dmn(
z;x)c=dFod4$*ok#SA^XEFEW14w)Q-BkOJw5l^GWN?r>a+Q%6m<wSWQ11B*x>eXLRr
zu2>{6Qz>_maxS(7j@wP7kCu@t;2lE!-}Cb=_r*%_u4B8!avzAXWU-RGAIy3NkE&h+
zjJgxb70l!3xZ!qd8SIhH15<Ee2tn$tN)qWM&ZoqPEJ*0W;cz|<hQALqau+mvY(Nsx
zyxS2ALMbk$fHAV|*zR>eFyHMB{CXbv-?82DCo<Tv(BN1)o`U>;VS|nnU!P0LdtVXg
QB>(^b07*qoM6N<$g5+i_`Tzg`

delta 607
zcmV-l0-*h~1)K$t7YZN<1^@s6b9#F8ks&pIF-b&0RCoccSJ83XFbsXo^}iYc8&utZ
zouJ+z+MwPb+CbSr?F4NnkUN3f39Jq54HDu4gb+>9l;n5!PA~}|5CsAVa2uWH+4JOC
z7wD7c(euT#_pGo1oj6jS3ml#zn+_{M#>vshZN{cCdcTak>J)ay0eKE04;dS)QyKez
z{hYzaj58<Cf1ab~A6cu-K8eix2lM-{=S6I5v%V+*J+@2q<n>f8j8Q=P<N!Wl1`k+=
z)HkJ!K5Yqr@RoRwX6@kl)$@ap<)3E%QEW(lk63~D3M!v7HqSFQJr?2#*Y}_Aw`TVo
zc<+bko+BSmC<GZJcI2=gHKv8hl^6|w=8qG$qcTAZCCVCYgZp8R!m8+uqHR1B=~d#i
z6E+DQisYit;4m$}K)4NheBW`MU~!^pALy3`kW$p|cS5)wEb|G}!p7+BF-^Sq#j*jw
zyq!khio*ue<YaaT1&0u>A2+fiLg(xeuJcW_GtoLs+p$aNX|nAScJ`&-k!nVNqmjwT
zwiz)F!b+Zu&yg;}Ci8z3fRjy++CsbF**GPHfNF$_8DBLWXg1dYJEX9)RydgTUBa$G
zVI3gc&Q@NxBbp7!75JSDwj~2ejDzPF*;i*H@-27KOsLne#r@Er@DnifdzOsgC0Nvq
z7!D!Y-`I{GnY>DkWTTO1hsgy>SbT~av6kGeAY7OCEKW<53!$@OQ7_09l(mTe%X&wg
t1NX@K6fScc4+%w8u5mwnGxBIRUIE}C?dM_4!chPK002ovPDHLkV1l&uBJcnJ

diff --git a/app/darwin/Ollama.app/Contents/Resources/iconDark.png b/app/darwin/Ollama.app/Contents/Resources/iconDark.png
index 451cc9d081d104218e1b0b7f4ee0988cb5eeddc8..f3c087b6fcbecf3f181e2623be4ab420d5210d38 100644
GIT binary patch
delta 340
zcmV-a0jvJ~0{#LaiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZy<e-lYW
zK~#7FjnThLLQxdJ@nZ%RR6M9D2!zH6Y6%*GhG^^$sHvfUprx^)KcKxeXiyYaMbOnr
z5objQ9R)!V{P~r4o<6Vd*MSdQ?mPF~^X?JZ4omza=-VoixcAskpk!|DcqCroQrAb=
z)AbGRq7*2jix0HX#}``2naOdFe*!0X!YB4M=K&)WQI&xB!92vT-(gD=dKh4air(t%
zcXYj)#;&V?^H}dVM;*_Y;9Km;)R1xC8Z){`iT(foxE1>mEiJz6<^@^2IS0%sEXQ_?
z3#4(4Q{-``#S(rU#I;>_Hzf@5ibvg_;!y0VY{UV^5<Z2wtlw)Z3K0(fD!C7sZ_tqN
m2+V0l=%5+YK}^D9BWD4`i%;ydg@%j(0000<MNUMnLSTYOVwrCM

delta 339
zcmV-Z0j&Q10{sFZiBL{Q4GJ0x0000DNk~Le0000F0000G2nGNE0LfM*1d$;%e-cSV
zK~#7Fm6Ho`!axv)w;2Sa4pIe89pIoypbjFTRnVfKpa2Pp1A+oT!NtL`7rrG+hT*X@
z-@x7Ozpo@BgXK!CMCDg5EuDk1Ca$+^6tGu5l&Lc3KK;&=H|3yIa>X`Esr(Zh9W%Nr
zl${A)oH&v_IbTVXtfQmg{9f13e-X)CAq?E@I9K?ixVeQ^zX@79VRQ*<cJW92xoW^M
z7L5t6t32b-k|eQY&V}-&tSGX;U$TQ@!k-dBvMqcn@67o_oR~1hXB<q}$mw}^jL}#i
zbG9;UfA425-E3(&a~WQc+W88bd4jl;%k@v;niW3YDqF^Q2kWqZw>!7ADMoHvOOe)J
lTIKiv*5Uc9%H=uh<Bz(LZw0Spg;D?j002ovPDHLkV1mDemumn3

diff --git a/app/darwin/Ollama.app/Contents/Resources/iconDark@2x.png b/app/darwin/Ollama.app/Contents/Resources/iconDark@2x.png
index 88ff572c681a7f6af39e12159ae8559a039e0a56..acd9452b8ccf70158f7f064ed45a4f807add6ccf 100644
GIT binary patch
delta 660
zcmV;F0&D$%2GIqO7YZQ=1^@s6xF)Glks&pIW=TXrRCoc^mrF>MK@`XTm1R++(Tl>$
zpa(rLYL!&rqQ@fJwTm`E5VfdHv`7TO$5LFl5nPBXS0XM1ABYHwf*_~}qTG!u7kULn
z@pV1NIUkJo-ub?naW?+p$IP9XGjr~pbIvGm3{*t?hr50d7ZE_;i40NUVDn6D{w6Jd
zJc(p|mbMc1`XcSCq=hyP+?4h)?DbsQCrJx!94L|YHtcm-+Dl0bZ5)VHp!GiyBT)Cu
zj1h0N`6&2KBY<j%U&MR)T&o?NO|`74Abt~72&|_uhetd@K%Is9R`W!PSg~+mS=LSv
ze~1(C)Opz?b42=NFK0CcI6R^Tj=DvE>;`loO%&%lsKDSr84joD64YH@)yBq&8K_jd
zN4(VL_`nU~hJ5Dtq@3u1rM_z356Ku;#2sQl`W&Df@h`;LQmFgRNS`&T?c-9)4}O8j
zuv^CN6LV1Cm~&juh(+QbaZ1)a6q_z>O$i(|s2TS{UBheQn~ZG{bwnf7FT-PhKcR|H
z3WqCYJ3Mp;xp~ilG%Wp1;v>{+sXJPfWy5=1F&z^37I4s=%i~nP^b3i1#0PDD5-NkT
z_qhNMwIMg1I%LCos4IxZ*NFz1%V*aDM{#<lkw2$fp`x6F@fvX*DkC^Wn+-NAvL;8S
zI?a#H6wKO#dV<$w4}SkSB@1JJY&bLKvIk9tDCq&=*eQpboZ^5ZnJZbSQoL<)z?226
zQ0W#*T+G(ss8ZOy|4DG1+=Zu70UTI>rz!&+9`P0)>I~>Wm+6qWQv3knR0a<Rg8XAC
uIs*>}W)V))rir+UR}917aUMzwIob!tfG0BCA!=>_0000<MNUMnLSTX<h%Pe#

delta 708
zcmV;#0z3WD1%L*S7YZN<1^@s6b9#F8ks&pIl}SWFRCocsSM71sFc5u{;Xh6Vhz{HV
zN(CGhaCG1fVk*c{!O;Qf;GhB@75GxYnF<aoejBaVvd<14-pm_W((Y<kT74LphHH6f
zS+}fO-d~Z=C{vSr+ISUQ%X7<%Va0(`s1owQMvhmYrh)Ht#;dk6A%D-lnzA`{rEL*^
zHbzk*_J~nsbj<NvX3H5JaoS@6_EaiZ|Iu>G?*r1)d|@9bE8hkC_E>;Qd7T;Kg&Md<
zKTk^IWYEnKb7wZr%790V60Dc#C!#|awKw`X`xfVcL<Hr)#mHnFbc5km6M3JoHw%(D
z4qX%>B0Yr<80Nu)>aVEd5ts0cnaGuY(bWD;4W4pB;IZI5aEQ_GjFA#?uTL?^g+$#b
z{T*T+WK#}Ebd_?bnlb1YYsCCGVEhn!fkdC1`oB<u@wk!;-Y9HW7+km+2@p5R0mt%*
z<ws1TY59|E5`7wC>le$U1A^2PeQ9~y@<iUT9@;;tZ|Q$e8G*wHQV!g*d{S+HkLaR0
zD#Kx^<S4G$e@6!zmV)0b-?Fqb^x~x?iQIH@q=o?whz|_C<x2EVzLK)~j&K~q-k7}^
zIH6n5FnGcGH|3m1w}xA#b2QO->UqTd{*`S7+m2APlUf2Ofp@0e(MiGQmLF985yOMV
z+DJ~nK&DJzqnc+r5w=yB=9&zD?*)(kNvi1)?*y?wfW5a1jGt~>V?>s%9?_A9&EOn(
zV~hkerf%WTCF36RA+}D4Pq=5?ObGuM*j*6dOnnU;S>~obfb3I`ZYIXobm@&KgX?+{
zI||AAZdP!>)7IYDe#Q-^aqU8y1JCl0DU&#$?{(_eY$^3?T5t0tQqS=(HJD@MacY;q
qo&{?m!^rt!9cU5?YoNhMaDM?F9)--B2MF%~0000<MNUMnLSTYgj#dZ&

diff --git a/app/lifecycle/lifecycle.go b/app/lifecycle/lifecycle.go
deleted file mode 100644
index ab624e81..00000000
--- a/app/lifecycle/lifecycle.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package lifecycle
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"log/slog"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/ollama/ollama/app/store"
-	"github.com/ollama/ollama/app/tray"
-)
-
-func Run() {
-	InitLogging()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	var done chan int
-
-	t, err := tray.NewTray()
-	if err != nil {
-		log.Fatalf("Failed to start: %s", err)
-	}
-	callbacks := t.GetCallbacks()
-
-	signals := make(chan os.Signal, 1)
-	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
-
-	go func() {
-		slog.Debug("starting callback loop")
-		for {
-			select {
-			case <-callbacks.Quit:
-				slog.Debug("quit called")
-				t.Quit()
-			case <-signals:
-				slog.Debug("shutting down due to signal")
-				t.Quit()
-			case <-callbacks.Update:
-				err := DoUpgrade(cancel, done)
-				if err != nil {
-					slog.Warn(fmt.Sprintf("upgrade attempt failed: %s", err))
-				}
-			case <-callbacks.ShowLogs:
-				ShowLogs()
-			case <-callbacks.DoFirstUse:
-				err := GetStarted()
-				if err != nil {
-					slog.Warn(fmt.Sprintf("Failed to launch getting started shell: %s", err))
-				}
-			}
-		}
-	}()
-
-	// Are we first use?
-	if !store.GetFirstTimeRun() {
-		slog.Debug("First time run")
-		err = t.DisplayFirstUseNotification()
-		if err != nil {
-			slog.Debug(fmt.Sprintf("XXX failed to display first use notification %v", err))
-		}
-		store.SetFirstTimeRun(true)
-	} else {
-		slog.Debug("Not first time, skipping first run notification")
-	}
-
-	if IsServerRunning(ctx) {
-		slog.Info("Detected another instance of ollama running, exiting")
-		os.Exit(1)
-	} else {
-		done, err = SpawnServer(ctx, CLIName)
-		if err != nil {
-			// TODO - should we retry in a backoff loop?
-			// TODO - should we pop up a warning and maybe add a menu item to view application logs?
-			slog.Error(fmt.Sprintf("Failed to spawn ollama server %s", err))
-			done = make(chan int, 1)
-			done <- 1
-		}
-	}
-
-	StartBackgroundUpdaterChecker(ctx, t.UpdateAvailable)
-
-	t.Run()
-	cancel()
-	slog.Info("Waiting for ollama server to shutdown...")
-	if done != nil {
-		<-done
-	}
-	slog.Info("Ollama app exiting")
-}
diff --git a/app/server_unix.go b/app/server_darwin.go
similarity index 96%
rename from app/server_unix.go
rename to app/server_darwin.go
index e0d45c8a..152f3483 100644
--- a/app/server_unix.go
+++ b/app/server_darwin.go
@@ -1,5 +1,3 @@
-//go:build !windows
-
 package main
 
 import (
diff --git a/scripts/publish.sh b/scripts/publish.sh
deleted file mode 100755
index 5bf15dcb..00000000
--- a/scripts/publish.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-# Set your variables here.
-REPO="jmorganca/ollama"
-
-# Check if VERSION is set
-if [[ -z "${VERSION}" ]]; then
-  echo "VERSION is not set. Please set the VERSION environment variable."
-  exit 1
-fi
-
-OS=$(go env GOOS)
-
-./script/build_${OS}.sh
-
-# Create a new tag if it doesn't exist.
-if ! git rev-parse v$VERSION >/dev/null 2>&1; then
-  git tag v$VERSION
-fi
-
-git push origin v$VERSION
-
-# Create a new release.
-gh release create -p v$VERSION -t v$VERSION
-
-# Upload the zip file.
-gh release upload v$VERSION ./dist/* --clobber
diff --git a/scripts/run_darwin.sh b/scripts/run_darwin.sh
index 89a32a2f..f4a736b2 100755
--- a/scripts/run_darwin.sh
+++ b/scripts/run_darwin.sh
@@ -2,6 +2,7 @@
 
 set -e
 
+rm -rf $TMPDIR/Ollama.app
 cp -R app/darwin/Ollama.app $TMPDIR/Ollama.app
 mkdir -p $TMPDIR/Ollama.app/Contents/Resources $TMPDIR/Ollama.app/Contents/MacOS
 go build -o $TMPDIR/Ollama.app/Contents/Resources/ollama .