From 95b67301d11df2568bcee4b52f378c0a0691da6f Mon Sep 17 00:00:00 2001
From: Raffaello Bonghi <raffaello@rnext.it>
Date: Tue, 5 Jul 2022 09:02:21 +0100
Subject: [PATCH] Fix L4T detect #75

---
 .gitignore                       | 1 +
 nanosaur/package.xml             | 2 +-
 nanosaur/scripts/nanosaur        | 7 +++++--
 nanosaur_control/package.xml     | 2 +-
 nanosaur_description/package.xml | 2 +-
 nanosaur_msgs/package.xml        | 2 +-
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 778b481..5bd05f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 
 # Output STL
 nanosaur-stl.zip
+test.*
 
 # VSCode
 .vscode/
diff --git a/nanosaur/package.xml b/nanosaur/package.xml
index b3bf467..c9c0c74 100644
--- a/nanosaur/package.xml
+++ b/nanosaur/package.xml
@@ -28,7 +28,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>nanosaur</name>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <description>nanosaur support meta package</description>
 
   <maintainer email="raffaello@rnext.it">Raffaello Bonghi</maintainer>
diff --git a/nanosaur/scripts/nanosaur b/nanosaur/scripts/nanosaur
index 5a5b28f..eb7401e 100755
--- a/nanosaur/scripts/nanosaur
+++ b/nanosaur/scripts/nanosaur
@@ -25,7 +25,7 @@
 # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 NANOSAUR_DATA='/opt/nanosaur'
-NANOSAUR_VERSION='2.0.1'
+NANOSAUR_VERSION='2.0.2'
 
 # Variable stored in configuration file
 ROS2_PATH='/opt/ros/foxy/setup.bash'
@@ -730,7 +730,7 @@ installer()
         # extract version
         local JETSON_L4T_ARRAY=$(echo $JETSON_L4T_STRING | cut -f 1 -d '-')
         # Load release and revision
-        local JETSON_L4T_RELEASE=$(echo $JETSON_L4T_ARRAY | cut -f 1 -d '.')
+        local JETSON_L4T_RELEASE=$(echo $JETSON_L4T_ARRAY | cut -f1,2 -d '.')
         local JETSON_L4T_REVISION=${JETSON_L4T_ARRAY#"$JETSON_L4T_RELEASE."}
 
         if [[ $JETSON_L4T_RELEASE != $NANOSAUR_L4T ]] ; then
@@ -744,6 +744,7 @@ installer()
     local type_developer=""
     # Recap installatation
     echo "------ Configuration ------"
+    echo " - ${bold}NVIDIA L4T:${reset} ${green}$JETSON_L4T_RELEASE.$JETSON_L4T_REVISION${reset}"
     echo " - ${bold}User:${reset} ${green}$USER${reset} - ${bold}Hostname:${reset} ${green}$HOSTNAME${reset}"
     echo " - ${bold}Install on:${reset} ${green}$PLATFORM${reset}"
     echo " - ${bold}Developer:${reset} ${green}$developer${reset}"
@@ -769,6 +770,8 @@ installer()
     # Request sudo password
     sudo -v
 
+    echo "${bold}${green}Install nanosaur on Jetpack L4T $JETSON_L4T_RELEASE.$JETSON_L4T_REVISION ${reset}"
+
     if [ ! -d $NANOSAUR_DATA ] ; then
         echo " - ${bold}${green}Make nanosaur folder in $NANOSAUR_DATA${reset}"
         # Build nanosaur folder structure
diff --git a/nanosaur_control/package.xml b/nanosaur_control/package.xml
index 7e82fbe..8e6d2e4 100644
--- a/nanosaur_control/package.xml
+++ b/nanosaur_control/package.xml
@@ -28,7 +28,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
    <name>nanosaur_control</name>
-   <version>2.0.1</version>
+   <version>2.0.2</version>
    <description>Set of launcher to control nanosaur, twist mux, etc...</description>
    <author email="raffaello@rnext.it">Raffaello Bonghi</author>
    <maintainer email="raffaello@rnext.it">Raffaello Bonghi</maintainer>
diff --git a/nanosaur_description/package.xml b/nanosaur_description/package.xml
index 7d83eec..b24329c 100644
--- a/nanosaur_description/package.xml
+++ b/nanosaur_description/package.xml
@@ -28,7 +28,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
    <name>nanosaur_description</name>
-   <version>2.0.1</version>
+   <version>2.0.2</version>
    <description>This package collect nanosaur meshes and urdf</description>
    <author email="raffaello@rnext.it">Raffaello Bonghi</author>
    <maintainer email="raffaello@rnext.it">Raffaello Bonghi</maintainer>
diff --git a/nanosaur_msgs/package.xml b/nanosaur_msgs/package.xml
index f933971..0595cfa 100644
--- a/nanosaur_msgs/package.xml
+++ b/nanosaur_msgs/package.xml
@@ -28,7 +28,7 @@ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 <?xml-model href="http://download.ros.org/schema/package_format3.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>nanosaur_msgs</name>
-  <version>2.0.1</version>
+  <version>2.0.2</version>
   <description>nanosaur basic messages and services</description>
 
   <maintainer email="raffaello@rnext.it">Raffaello Bonghi</maintainer>