Renamed ollama-{darwin,linux} to just ollama on both systems

electric-sql · Jan 31, 2024 · f45cfa2 · f45cfa2
1 parent 8f2034b
commit f45cfa2
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 22 deletions.
diff --git a/examples/tauri-postgres/src-tauri/src/main.rs b/examples/tauri-postgres/src-tauri/src/main.rs
@@ -531,10 +531,7 @@ fn main() {
     let mut envs: HashMap<String, String> = HashMap::new();
     envs.insert("OLLAMA_HOST".to_string(), host);
 
-    #[cfg(target_os = "macos")]
-    let ollama_name = "ollama-darwin";
-    #[cfg(target_os = "linux")]
-    let ollama_name = "ollama-linux";
+    let ollama_name = "ollama";
 
     let (mut rx, mut _child) = Command::new_sidecar(ollama_name)
     .expect(format!("failed to create `{}` binary command", ollama_name).as_str())

diff --git a/examples/tauri-postgres/src-tauri/tauri.linux.conf.json b/examples/tauri-postgres/src-tauri/tauri.linux.conf.json
@@ -5,14 +5,14 @@
         "all": false,
         "shell":{
           "scope": [
-            { "name": "./ollama-linux", "sidecar": true }
+            { "name": "./ollama", "sidecar": true }
           ],
           "sidecar": true
         }
       },
       "bundle": {
         "externalBin": [
-          "./ollama-linux"
+          "./ollama"
         ],
         "identifier": "electric-tauri-postgres",
         "resources": ["./libonnxruntime.so", "./pgdir/*"]

diff --git a/examples/tauri-postgres/src-tauri/tauri.macos.conf.json b/examples/tauri-postgres/src-tauri/tauri.macos.conf.json
@@ -5,14 +5,14 @@
         "all": false,
         "shell":{
           "scope": [
-            { "name": "./ollama-darwin", "sidecar": true }
+            { "name": "./ollama", "sidecar": true }
           ],
           "sidecar": true
         }
       },
       "bundle": {
         "externalBin": [
-          "./ollama-darwin"
+          "./ollama"
         ],
         "identifier": "electric-tauri-postgres",
         "macOS": {

diff --git a/examples/tauri-postgres/utils-darwin.sh b/examples/tauri-postgres/utils-darwin.sh
@@ -40,7 +40,7 @@ install_ollama() {
     chmod +x ollama-darwin
 
     # Tauri needs this specific name
-    mv ollama-darwin src-tauri/ollama-darwin-aarch64-apple-darwin
+    mv ollama-darwin src-tauri/ollama-aarch64-apple-darwin
 }
 
 # Install postgres

diff --git a/examples/tauri-postgres/utils-linux.sh b/examples/tauri-postgres/utils-linux.sh
@@ -41,7 +41,7 @@ install_ollama() {
     chmod +x ollama-linux-amd64
 
     # Tauri needs this specific name
-    mv ollama-linux-amd64 src-tauri/ollama-linux-x86_64-unknown-linux-gnu
+    mv ollama-linux-amd64 src-tauri/ollama-x86_64-unknown-linux-gnu
 }
 
 # Install postgres

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml