Fixups

Signed-off-by: Ettore Di Giacinto <[email protected]>

Author: mudler

.github/workflows/build-test.yaml

@@ -34,7 +34,7 @@ jobs:
           go-version: 1.23
       - name: Build launcher for macOS ARM64
         run: |
-          make create-dmg
+          make build-launcher-darwin
           ls -liah dist
       - name: Upload macOS launcher artifacts
         uses: actions/upload-artifact@v4

.github/workflows/release.yaml

@@ -37,15 +37,15 @@ jobs:
           go-version: 1.23
       - name: Build launcher for macOS ARM64
         run: |
-          make create-dmg
+          make build-launcher-darwin
       - name: Upload DMG to Release
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           url: ${{ github.event.release.upload_url }}
           asset_path: ./dist/LocalAI-Launcher.dmg
-          asset_name: LocalAI-Launcher.dmg
+          asset_name: LocalAI.dmg
           asset_content_type: application/octet-stream
   launcher-build-linux:
     runs-on: ubuntu-latest

Makefile

@@ -516,22 +516,13 @@ docs: docs/static/gallery.html
 ########################################################
 
 ## fyne cross-platform build
-build-launcher-darwin:
-	cd cli/launcher && go run fyne.io/tools/cmd/fyne@latest package -os darwin -icon ../../core/http/static/logo.png --executable $(LAUNCHER_BINARY_NAME)-darwin && mv launcher.app ../../$(LAUNCHER_BINARY_NAME)-darwin.app
+build-launcher-darwin: build-launcher
+	go run github.com/tiagomelo/macos-dmg-creator/cmd/createdmg@latest \
+	--appName "LocalAI" \
+	--appBinaryPath "$(LAUNCHER_BINARY_NAME)" \
+	--bundleIdentifier "com.localai.launcher" \
+	--iconPath "core/http/static/logo.png" \
+	--outputDir "dist/"
 
 build-launcher-linux:
-	cd cli/launcher && go run fyne.io/tools/cmd/fyne@latest package -os linux -icon ../../core/http/static/logo.png --executable $(LAUNCHER_BINARY_NAME)-linux && mv launcher.tar.xz ../../$(LAUNCHER_BINARY_NAME)-linux.tar.xz
-
-# macOS DMG creation (requires macOS)
-create-dmg: build-launcher-darwin ## Create macOS DMG
-ifeq ($(OS),Darwin)
-	@echo "Creating macOS DMG package..."
-	mkdir -p dist/LocalAI-Launcher
-	cp -rfv $(LAUNCHER_BINARY_NAME)-darwin.app dist/LocalAI-Launcher/LocalAI-Launcher
-	ln -sf /Applications dist/LocalAI-Launcher/Applications
-	hdiutil create -volname "LocalAI Launcher" -srcfolder dist/LocalAI-Launcher -ov -format UDZO dist/LocalAI-Launcher.dmg
-	rm -rf dist/LocalAI-Launcher
-	@echo "DMG created: dist/LocalAI-Launcher.dmg"
-else
-	@echo "DMG creation requires macOS"
-endif
+	cd cli/launcher && go run fyne.io/tools/cmd/fyne@latest package -os linux -icon ../../core/http/static/logo.png --executable $(LAUNCHER_BINARY_NAME)-linux && mv launcher.tar.xz ../../$(LAUNCHER_BINARY_NAME)-linux.tar.xz

core/launcher/launcher.go

@@ -155,11 +155,13 @@ func (l *Launcher) Initialize() error {
 	// Check if LocalAI is installed
 	if !l.releaseManager.IsLocalAIInstalled() {
 		log.Printf("No LocalAI installation found")
-		l.updateStatus("No LocalAI installation found")
-		if l.ui != nil {
-			// Show dialog offering to download LocalAI
-			l.showDownloadLocalAIDialog()
-		}
+		fyne.Do(func() {
+			l.updateStatus("No LocalAI installation found")
+			if l.ui != nil {
+				// Show dialog offering to download LocalAI
+				l.showDownloadLocalAIDialog()
+			}
+		})
 	}
 
 	// Check for updates periodically
@@ -226,8 +228,10 @@ func (l *Launcher) StartLocalAI() error {
 	}
 
 	l.isRunning = true
-	l.updateStatus("LocalAI is starting...")
-	l.updateRunningState(true)
+	fyne.Do(func() {
+		l.updateStatus("LocalAI is starting...")
+		l.updateRunningState(true)
+	})
 
 	// Start log monitoring
 	go l.monitorLogs(stdout, "STDOUT")
@@ -238,11 +242,17 @@ func (l *Launcher) StartLocalAI() error {
 		// Wait for process to start or fail
 		err := l.localaiCmd.Wait()
 		l.isRunning = false
-		l.updateRunningState(false)
+		fyne.Do(func() {
+			l.updateRunningState(false)
+		})
 		if err != nil {
-			l.updateStatus(fmt.Sprintf("LocalAI stopped with error: %v", err))
+			fyne.Do(func() {
+				l.updateStatus(fmt.Sprintf("LocalAI stopped with error: %v", err))
+			})
 		} else {
-			l.updateStatus("LocalAI stopped")
+			fyne.Do(func() {
+				l.updateStatus("LocalAI stopped")
+			})
 		}
 	}()
 
@@ -255,8 +265,10 @@ func (l *Launcher) StartLocalAI() error {
 				if err := l.localaiCmd.Process.Signal(syscall.Signal(0)); err != nil {
 					// Process is dead, mark as not running
 					l.isRunning = false
-					l.updateRunningState(false)
-					l.updateStatus("LocalAI failed to start properly")
+					fyne.Do(func() {
+						l.updateRunningState(false)
+						l.updateStatus("LocalAI failed to start properly")
+					})
 				}
 			}
 		}
@@ -280,8 +292,10 @@ func (l *Launcher) StopLocalAI() error {
 	}
 
 	l.isRunning = false
-	l.updateRunningState(false)
-	l.updateStatus("LocalAI stopped")
+	fyne.Do(func() {
+		l.updateRunningState(false)
+		l.updateStatus("LocalAI stopped")
+	})
 	return nil
 }