From 12bbdecbd4f2747c1656b7e5263a34090b0708cc Mon Sep 17 00:00:00 2001
From: Davide Faconti <davide.faconti@gmail.com>
Date: Tue, 9 Jan 2024 13:25:43 +0100
Subject: [PATCH] update snaps

---
 snap_core20/snapcraft.yaml                  |  2 +-
 snap_core22/local/launcher-plotjuggler-ros2 |  2 ++
 snap_core22/snapcraft.yaml                  | 10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/snap_core20/snapcraft.yaml b/snap_core20/snapcraft.yaml
index a1a666b13..ba562d646 100644
--- a/snap_core20/snapcraft.yaml
+++ b/snap_core20/snapcraft.yaml
@@ -28,7 +28,7 @@ package-repositories:
     url: http://packages.ros.org/ros/ubuntu
 
 apps:
-  plotjuggler:
+  plotjuggler-ros:
     command: usr/bin/launcher-plotjuggler-ros
     plugs: [network, network-bind, home, removable-media]
     extensions: [kde-neon]
diff --git a/snap_core22/local/launcher-plotjuggler-ros2 b/snap_core22/local/launcher-plotjuggler-ros2
index b39a73f54..695572fe4 100755
--- a/snap_core22/local/launcher-plotjuggler-ros2
+++ b/snap_core22/local/launcher-plotjuggler-ros2
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+export LD_LIBRARY_PATH=$SNAP/opt/ros/humble/lib:$SNAP/opt/ros/snap/lib:$SNAP/usr/local/lib:$LD_LIBRARY_PATH
+
 # Paths to ROS 2 plugins
 export PLUGIN_FOLDERS=$SNAP/opt/ros/snap/lib/plotjuggler_ros
 export AMENT_PREFIX_PATH=$SNAP/opt/ros/humble
diff --git a/snap_core22/snapcraft.yaml b/snap_core22/snapcraft.yaml
index 6c682ee9c..7e2335cf6 100644
--- a/snap_core22/snapcraft.yaml
+++ b/snap_core22/snapcraft.yaml
@@ -1,14 +1,14 @@
-name: plotjuggler-ros2
-adopt-info: plotjuggler-ros2 # parse metadata from the plotjuggler part
+name: plotjuggler
+adopt-info: plotjuggler # parse metadata from the plotjuggler part
 summary: The timeseries visualization tool that you deserve
 description: |
   QT5 based application to display time series in plots,
   using an intuitive "drag and drop" interface.
 
   The snap comes with only ROS 2 plugins.
-  You can launch it with
+  You can launch it with:
 
-    $ plotjuggler-ros2
+    $ plotjuggler
 
 
 issues: https://github.com/facontidavide/plotjuggler/issues
@@ -19,7 +19,7 @@ confinement: strict
 base: core22
 
 apps:
-  plotjuggler-ros2:
+  plotjuggler:
     command: usr/bin/launcher-plotjuggler-ros2
     plugs: [network, network-bind, home, removable-media]
     extensions: [kde-neon, ros2-humble]