Move Mac App to a new dir

9da9e8fb · Daniel Hiltgen · jmorganca · 42e77e2a · 9da9e8fb · 9da9e8fb
Commit 9da9e8fb authored Feb 13, 2024 by Daniel Hiltgen Committed by jmorganca Feb 15, 2024
12 changed files
--- a/app/src/index.ts
+++ b/app/src/index.ts
--- a/app/src/install.ts
+++ b/app/src/install.ts
--- a/app/src/ollama.svg
+++ b/app/src/ollama.svg
--- a/app/src/preload.ts
+++ b/app/src/preload.ts
--- a/app/src/renderer.tsx
+++ b/app/src/renderer.tsx
--- a/app/tailwind.config.js
+++ b/app/tailwind.config.js
--- a/app/tsconfig.json
+++ b/app/tsconfig.json
--- a/app/webpack.main.config.ts
+++ b/app/webpack.main.config.ts
--- a/app/webpack.plugins.ts
+++ b/app/webpack.plugins.ts
--- a/app/webpack.renderer.config.ts
+++ b/app/webpack.renderer.config.ts
--- a/app/webpack.rules.ts
+++ b/app/webpack.rules.ts
--- a/scripts/build_darwin.sh
+++ b/scripts/build_darwin.sh
@@ -24,13 +24,13 @@ fi
 chmod +x dist/ollama

 # build and optionally sign the mac app
-npm install --prefix app
+npm install --prefix macapp
 if [ -n "$APPLE_IDENTITY" ]; then
-    npm run --prefix app make:sign
+    npm run --prefix macapp make:sign
 else 
-    npm run --prefix app make
+    npm run --prefix macapp make
 fi
-cp app/out/make/zip/darwin/universal/Ollama-darwin-universal-$VERSION.zip dist/Ollama-darwin.zip
+cp macapp/out/make/zip/darwin/universal/Ollama-darwin-universal-$VERSION.zip dist/Ollama-darwin.zip

 # sign the binary and rename it
 if [ -n "$APPLE_IDENTITY" ]; then