From 91a27714e7daf0df983235018a4dc1ea75d56201 Mon Sep 17 00:00:00 2001
From: Davide Faconti <davide.faconti@gmail.com>
Date: Tue, 9 Jan 2024 12:31:16 +0100
Subject: [PATCH] WIP

---
 .gitignore                 | 1 +
 snap_core20/snapcraft.yaml | 9 +++++----
 snap_core22/snapcraft.yaml | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 962d0b24d..0399f2c04 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@ _deps
 
 # Clangd
 .cache
+/snap/*
diff --git a/snap_core20/snapcraft.yaml b/snap_core20/snapcraft.yaml
index f569b97fd..a1a666b13 100644
--- a/snap_core20/snapcraft.yaml
+++ b/snap_core20/snapcraft.yaml
@@ -1,5 +1,5 @@
-name: plotjuggler
-adopt-info: plotjuggler # parse metadata from the plotjuggler part
+name: plotjuggler-ros
+adopt-info: plotjuggler-ros # parse metadata from the plotjuggler part
 summary: The timeseries visualization tool that you deserve
 description: |
   QT5 based application to display time series in plots,
@@ -8,7 +8,7 @@ description: |
   The snap comes with only ROS 2 plugins.
   You can launch it with
 
-    $ plotjuggler
+    $ plotjuggler-ros
 
 issues: https://github.com/facontidavide/plotjuggler/issues
 source-code: https://github.com/facontidavide/plotjuggler
@@ -57,7 +57,6 @@ parts:
       - libprotobuf-dev
       - libzmq5
       - libzstd1
-      - libpsm-infinipath1
     override-pull: |
         snapcraftctl pull
 
@@ -87,6 +86,8 @@ parts:
       - python3-vcstool
       - ros-noetic-ros-environment
       - ros-noetic-catkin
+    stage-packages:
+      - libpsm-infinipath1
     override-pull: |
       if [ ! -d plotjuggler-ros-plugins ]; then
 
diff --git a/snap_core22/snapcraft.yaml b/snap_core22/snapcraft.yaml
index 6b13d7426..6c682ee9c 100644
--- a/snap_core22/snapcraft.yaml
+++ b/snap_core22/snapcraft.yaml
@@ -1,5 +1,5 @@
-name: plotjuggler
-adopt-info: plotjuggler # parse metadata from the plotjuggler part
+name: plotjuggler-ros2
+adopt-info: plotjuggler-ros2 # parse metadata from the plotjuggler part
 summary: The timeseries visualization tool that you deserve
 description: |
   QT5 based application to display time series in plots,
@@ -8,7 +8,7 @@ description: |
   The snap comes with only ROS 2 plugins.
   You can launch it with
 
-    $ plotjuggler
+    $ plotjuggler-ros2
 
 
 issues: https://github.com/facontidavide/plotjuggler/issues
@@ -19,7 +19,7 @@ confinement: strict
 base: core22
 
 apps:
-  plotjuggler:
+  plotjuggler-ros2:
     command: usr/bin/launcher-plotjuggler-ros2
     plugs: [network, network-bind, home, removable-media]
     extensions: [kde-neon, ros2-humble]