From ee48ff7e5a82699cfefb110a3f5681c23d1d9b2e Mon Sep 17 00:00:00 2001
From: gibbyb <gib@gibbyb.com>
Date: Wed, 29 Jan 2025 18:53:44 -0600
Subject: [PATCH] Cant remember

---
 bin/sunhat-upgrade                 | 29 +++++++++++++++++++++++++++++
 install/optional/service_ollama.sh |  3 ++-
 packages/espanso                   |  2 +-
 packages/grub-btrfs                |  2 +-
 4 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100644 bin/sunhat-upgrade

diff --git a/bin/sunhat-upgrade b/bin/sunhat-upgrade
new file mode 100644
index 0000000..f8635c1
--- /dev/null
+++ b/bin/sunhat-upgrade
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+echo "Updating ollama..."
+source $SUNHAT_PATH/install/optional/service_ollama.sh
+echo "Ollama Update Complete."
+
+echo "Updating Espanso..."
+cd ~/.local/share/sunhat/packages/espanso
+git pull
+cargo install --force cargo-make --version 0.34.0
+cargo make --profile release --env NO_X11=true build-binary
+sudo mv target/release/espanso /usr/local/bin/espanso
+sudo setcap "cap_dac_override+p" $(which espanso)
+espanso service register
+espanso start
+echo "Espanso Update Complete."
+
+
+echo "Updating John the Ripper..."
+cd ~/.local/share/sunhat/packages/JohnTheRipper/src
+git pull
+./configure && make
+echo "John the Ripper Update Complete."
+
+echo "Updating Hanabi"
+cd ~/.local/share/sunhat/packages/hanabi
+git pull
+./run.sh install
+echo "Hanabi installed"
diff --git a/install/optional/service_ollama.sh b/install/optional/service_ollama.sh
index 1649703..3ae24d7 100644
--- a/install/optional/service_ollama.sh
+++ b/install/optional/service_ollama.sh
@@ -136,12 +136,13 @@ Description=Ollama Service
 After=network-online.target
 
 [Service]
-ExecStart=/bin/bash -lc 'OLLAMA_HOST=0.0.0.0:4242 $BINDIR/ollama serve'
+ExecStart=$BINDIR/ollama serve
 User=ollama
 Group=ollama
 Restart=always
 RestartSec=3
 Environment="PATH=$PATH"
+Environment="OLLAMA_HOST=0.0.0.0:4242"
 
 [Install]
 WantedBy=default.target
diff --git a/packages/espanso b/packages/espanso
index b9ac086..fd9a7dd 160000
--- a/packages/espanso
+++ b/packages/espanso
@@ -1 +1 @@
-Subproject commit b9ac086adf5c14d07f8b60a7009acd878f6cf7ca
+Subproject commit fd9a7dd4f2afccaeb61623286b1230c0df0c7033
diff --git a/packages/grub-btrfs b/packages/grub-btrfs
index f682e17..b509fca 160000
--- a/packages/grub-btrfs
+++ b/packages/grub-btrfs
@@ -1 +1 @@
-Subproject commit f682e17b30def8ebbf9b4b3f0a60df0443633e4c
+Subproject commit b509fcaf6119d5c4b07fe37692fc3d5c6cb94f56