Merge pull request #198 from fvdb/update-grok-bot-0.24.0

Update grok-bot to 0.24.0

pkgbuilds/grok-bot/PKGBUILD

@@ -2,9 +2,9 @@
 # Contributor: Omarchy
 
 pkgname=grok-bot
-pkgver=0.18.0
+pkgver=0.24.0
 pkgrel=1
-_commit=1618156107ae6cc9b7ab5dc1e3ba5ea5aa1425de
+_commit=302d75da596fc8d11ee0446a19b31c33c6676c2c
 pkgdesc='Grok Bot desktop agent'
 arch=('x86_64')
 url='https://x.ai/bot'
@@ -30,9 +30,9 @@ source=(
   'grok-bot.sh'
   'grok-bot.desktop'
 )
-sha256sums=('380726acd4372b8a5668340f6ff7faf01b9bb1d4864d074a62ce7e461d17408b'
-            '2bdc0c7002200adce8a8676efb02733537df1388cb85c4257452009257570819'
-            'a5a8dc8e31485325c336185487b95e1e69c715f498025f1ae774532fe99290b9')
+sha256sums=('5fd091d63fa410717737797ae0b14967e4f1567cae201d10c834430e4807f32d'
+            '6dfa6c305941afa6cbaefbeaae06d05ab5a88f31630005d25a819a160c20c7a3'
+            '856056c9ca63dda5d01158ce8fb6a9a7cbb3f67c13a92b573cd196d3e50f26e7')
 noextract=("${pkgname}_${pkgver}.deb")
 
 package() {
@@ -42,12 +42,18 @@ package() {
   rm -rf "${pkgdir}/usr/share/doc" \
     "${pkgdir}/usr/share/applications/sand.desktop"
 
-  install -Dm644 "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/sand.png" \
-    "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/grok-bot.png"
-  install -Dm644 "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/grok-bot.png" \
-    "${pkgdir}/usr/share/icons/hicolor/512x512/apps/grok-bot.png"
-  rm -f "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/sand.png"
+  local icon1024="${pkgdir}/usr/share/icons/hicolor/1024x1024/apps"
+  if [[ -f "${icon1024}/sand.png" && ! -f "${icon1024}/grok-bot.png" ]]; then
+    install -Dm644 "${icon1024}/sand.png" "${icon1024}/grok-bot.png"
+  fi
+  rm -f "${icon1024}/sand.png"
+  if [[ -f "${icon1024}/grok-bot.png" ]]; then
+    install -Dm644 "${icon1024}/grok-bot.png" \
+      "${pkgdir}/usr/share/icons/hicolor/512x512/apps/grok-bot.png"
+  fi
 
+  # Always install our Wayland wrapper; do not keep any /usr/bin from the .deb.
+  rm -f "${pkgdir}/usr/bin/grok-bot" "${pkgdir}/usr/bin/sand"
   install -Dm755 "${srcdir}/grok-bot.sh" "${pkgdir}/usr/bin/grok-bot"
   ln -s grok-bot "${pkgdir}/usr/bin/sand"
   install -Dm644 "${srcdir}/grok-bot.desktop" \

pkgbuilds/grok-bot/grok-bot.desktop

@@ -7,7 +7,7 @@ Icon=grok-bot
 Terminal=false
 Type=Application
 Categories=Development;
-MimeType=x-scheme-handler/sand;
+MimeType=x-scheme-handler/grokbot;x-scheme-handler/sand;
 StartupWMClass=Grok Bot
 StartupNotify=true
 Keywords=Grok;AI;Agent;

pkgbuilds/grok-bot/grok-bot.sh

@@ -9,7 +9,14 @@ if [[ -f $XDG_CONFIG_HOME/grok-bot-flags.conf ]]; then
 	GROK_BOT_USER_FLAGS="$(sed 's/#.*//' "$XDG_CONFIG_HOME/grok-bot-flags.conf" | tr '\n' ' ')"
 fi
 
-exec "/opt/Grok Bot/sand" \
+# 0.24.0 renamed the binary sand -> grok-bot.
+if [[ -x "/opt/Grok Bot/grok-bot" ]]; then
+	GROK_BOT_BIN="/opt/Grok Bot/grok-bot"
+else
+	GROK_BOT_BIN="/opt/Grok Bot/sand"
+fi
+
+exec "$GROK_BOT_BIN" \
 	--ozone-platform=wayland \
 	--enable-features=UseOzonePlatform,WaylandWindowDecorations \
 	--enable-wayland-ime \