From 801d09d136fb30a1416314b17723738414eba533 Mon Sep 17 00:00:00 2001
From: aeon <jerry73204@gmail.com>
Date: Fri, 25 Nov 2022 04:07:51 +0800
Subject: [PATCH] [r2r_common] Do not panic in get_wanted_messages() if
 AMENT_PREFIX_PATH is not set

---
 r2r_common/src/lib.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/r2r_common/src/lib.rs b/r2r_common/src/lib.rs
index 764b91f..127f64f 100644
--- a/r2r_common/src/lib.rs
+++ b/r2r_common/src/lib.rs
@@ -148,13 +148,16 @@ pub fn get_wanted_messages() -> Vec<RosMsg> {
         get_ros_msgs_files(&dirs)
     } else {
         // Else we look for all msgs we can find using the ament prefix path.
-        let ament_prefix_var = env::var("AMENT_PREFIX_PATH").expect("Source your ROS!");
-        let paths = ament_prefix_var
-            .split(':')
-            .map(Path::new)
-            .collect::<Vec<_>>();
+        if let Ok(ament_prefix_var) = env::var("AMENT_PREFIX_PATH") {
+            let paths = ament_prefix_var
+                .split(':')
+                .map(Path::new)
+                .collect::<Vec<_>>();
 
-        get_ros_msgs(&paths)
+            get_ros_msgs(&paths)
+        } else {
+            vec![]
+        }
     };
 
     let msgs = parse_msgs(&msgs);