From e24b06b0f64e1ea5f370ea30744bdb639201bc09 Mon Sep 17 00:00:00 2001
From: Unrud <unrud@outlook.com>
Date: Sun, 13 Sep 2020 10:25:29 +0200
Subject: [PATCH] Separate tags with comma

---
 README.md                                    | 2 +-
 flatpak/com.github.unrud.RemoteTouchpad.yaml | 2 +-
 snap/snapcraft.yaml                          | 6 ++++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 0db3ce9..d98f1e8 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ Supports Flatpak's RemoteDesktop portal (for Wayland), Windows and X11.
   * [Snap](https://snapcraft.io/remote-touchpad)
   * [Windows](https://github.com/Unrud/remote-touchpad/releases/latest)
   * Golang:
-      * Portal & X11: `go get -u -tags 'portal x11' github.com/Unrud/remote-touchpad`
+      * Portal & X11: `go get -u -tags portal,x11 github.com/Unrud/remote-touchpad`
       * Windows: `get get -u github.com/Unrud/remote-touchpad`
 
 ## Screenshots
diff --git a/flatpak/com.github.unrud.RemoteTouchpad.yaml b/flatpak/com.github.unrud.RemoteTouchpad.yaml
index 3901c21..4344540 100644
--- a/flatpak/com.github.unrud.RemoteTouchpad.yaml
+++ b/flatpak/com.github.unrud.RemoteTouchpad.yaml
@@ -34,7 +34,7 @@ modules:
         dest: src/github.com/unrud/remote-touchpad
     buildsystem: simple
     build-commands:
-      - . /usr/lib/sdk/golang/enable.sh; env GOPATH="$(pwd)" go build -tags 'portal x11' github.com/unrud/remote-touchpad
+      - . /usr/lib/sdk/golang/enable.sh; env GOPATH="$(pwd)" go build -tags portal,x11 github.com/unrud/remote-touchpad
       - install -Dm0755 -t /app/bin remote-touchpad
       - install -Dm0755 -t /app/bin src/github.com/unrud/remote-touchpad/desktop/remote-touchpad-wait-on-error
       - install -Dm0644 -t /app/share/metainfo src/github.com/unrud/remote-touchpad/desktop/com.github.unrud.RemoteTouchpad.appdata.xml
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 93e34f5..3098e75 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -32,7 +32,9 @@ parts:
   remote-touchpad:
     plugin: go
     go-importpath: github.com/Unrud/remote-touchpad
-    go-buildtags: [portal x11]
+    go-buildtags:
+      - portal
+      - x11
     source: .
     source-type: git
     build-packages:
@@ -47,7 +49,7 @@ parts:
       snapcraftctl pull
       # WORKAROUND: Snapcraft Go Plugin doesn't set buildtags for go-get
       GOPATH="$(realpath "${SNAPCRAFT_PART_SRC}/../go")"
-      env --chdir="$GOPATH/src" GOPATH="$GOPATH" go get -t -d -tags 'portal x11' ./github.com/Unrud/remote-touchpad/...
+      env --chdir="$GOPATH/src" GOPATH="$GOPATH" go get -t -d -tags portal,x11 ./github.com/Unrud/remote-touchpad/...
       # WORKAROUND: Point icon directly to high resolution version otherwise snapcraft automatically chooses lowest resolution
       sed -e 's|Icon=com.github.unrud.RemoteTouchpad|Icon=/usr/share/icons/hicolor/512x512/apps/com.github.unrud.RemoteTouchpad.png|' -i desktop/com.github.unrud.RemoteTouchpad.desktop
     override-build: |