From c257be4177378638ee30a4f07d0b4f80e5c7653a Mon Sep 17 00:00:00 2001
From: Bernd Schoolmann <mail@quexten.com>
Date: Sat, 4 May 2024 02:33:40 +0200
Subject: [PATCH] Fix Flatpak dev build

---
 .gitignore                           |  1 +
 gui/com.quexten.Goldwarden.Devel.yml | 38 +++++++++++++++++++++-------
 gui/src/services/goldwarden.py       |  2 +-
 3 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index add7776..6cf998c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ flatpak-pip-generator
 repo
 __debug*
 .templates
+vendor
\ No newline at end of file
diff --git a/gui/com.quexten.Goldwarden.Devel.yml b/gui/com.quexten.Goldwarden.Devel.yml
index f2400da..55d5991 100644
--- a/gui/com.quexten.Goldwarden.Devel.yml
+++ b/gui/com.quexten.Goldwarden.Devel.yml
@@ -1,9 +1,7 @@
 id: com.quexten.Goldwarden
 runtime: org.gnome.Platform
 runtime-version: '45'
-sdk: org.freedesktop.Sdk//23.08
-sdk-extensions:
-    - org.freedesktop.Sdk.Extension.golang
+sdk: org.gnome.Sdk
 command: goldwarden_ui_main.py
 finish-args:
   # Allow network access for sync
@@ -26,6 +24,12 @@ finish-args:
   - --talk-name=org.gnome.keyring.SystemPrompter
   # biometric / user password auth
   - --system-talk-name=org.freedesktop.PolicyKit1
+
+build-options:
+  env:
+    - GOBIN=/app/bin/.buildtools/golang/bin/
+    - GOROOT=/app/bin/.buildtools/golang/
+
 modules:
   - name: golang
     buildsystem: simple
@@ -51,16 +55,32 @@ modules:
           stable-only: true
           url-template: https://go.dev/dl/go$version.linux-amd64.tar.gz
     build-commands:
-      - install -d /usr/lib/sdk/golang
-      - cp -rpv * /usr/lib/sdk/golang/
+      - mkdir -p /app/bin/.buildtools/golang/
+      - install -d /app/bin/.buildtools/golang/
+      - cp -rpv * /app/bin/.buildtools/golang/
+  - name: go-vendor
+    buildsystem: simple
+    build-commands:
+      - mkdir -p /app/bin/.buildtools/golang/src/github.com/quexten/goldwarden/vendor/
+      - cp -r ./* /app/bin/.buildtools/golang/src/github.com/quexten/goldwarden/vendor/
+    sources:
+      - type: dir
+        path: ../vendor/
+  - name: go-cli 
+    buildsystem: simple
+    build-commands:
+      - mkdir -p /app/bin/.buildtools/golang/src/github.com/quexten/goldwarden/cli/
+      - cp -r ./* /app/bin/.buildtools/golang/src/github.com/quexten/goldwarden/cli/
+    sources:
+      - type: dir
+        path: ../cli/
   - name: goldwarden-core-daemon
     buildsystem: simple
     build-commands:
-      - go build -o goldwarden ./main.go
-      - install -D goldwarden /app/bin/goldwarden
+      - cp -r ./* /app/bin/.buildtools/golang/src/github.com/quexten/goldwarden/
+      - cd /app/bin/.buildtools/golang/src/github.com/quexten/goldwarden/ && /app/bin/.buildtools/golang/bin/go build -o goldwarden . 
+      - cd /app/bin/.buildtools/golang/src/github.com/quexten/goldwarden/ && install -D goldwarden /app/bin/goldwarden
     sources:
-      - type: dir
-        path: ../gui/
       - type: file
         path: ../main.go
       - type: file
diff --git a/gui/src/services/goldwarden.py b/gui/src/services/goldwarden.py
index b9fd5cf..d691c17 100644
--- a/gui/src/services/goldwarden.py
+++ b/gui/src/services/goldwarden.py
@@ -142,7 +142,7 @@ def autotype(text):
 
 def version():
     result = send_authenticated_command(f"version")
-    return result
+    return result.strip()
 
 def is_daemon_running():
     result = send_authenticated_command(f"vault status")