From 00fba45ffa7eefa2597054af3dee2fcf2c045d3b Mon Sep 17 00:00:00 2001 From: Beomyeol Yu Date: Mon, 30 May 2022 14:16:20 -0400 Subject: [PATCH] getpass.getuser() instead of os.getlogin() for Ubuntu/ROS2 --- .../ros2_gym_pybullet_drones/aviary_wrapper.py | 7 +++++-- .../ros2_gym_pybullet_drones/random_control.py | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/aviary_wrapper.py b/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/aviary_wrapper.py index ff387c1d8..c01a8e7e4 100644 --- a/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/aviary_wrapper.py +++ b/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/aviary_wrapper.py @@ -4,9 +4,12 @@ It publishes on topic 'obs' and reads from topic 'action'. """ import sys, os # See: https://github.com/utiasDSL/gym-pybullet-drones/issues/89 +import getpass sys.path.append(sys.path[0].replace("ros2/install/ros2_gym_pybullet_drones/lib/ros2_gym_pybullet_drones", "")) -sys.path.append("/Users/"+os.getlogin()+"/opt/anaconda3/envs/drones/lib/python3.8/site-packages") # macOS -# sys.path.append("/home/"+os.getlogin()+"/anaconda3/envs/drones/lib/python3.8/site-packages") # Ubuntu +if sys.platform == 'darwin': # macOS + sys.path.append("/Users/"+os.getlogin()+"/opt/anaconda3/envs/drones/lib/python3.8/site-packages") +elif sys.platform == 'linux': # Ubuntu + sys.path.append("/home/"+getpass.getuser()+"/anaconda3/envs/drones/lib/python3.8/site-packages") import rclpy import numpy as np diff --git a/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/random_control.py b/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/random_control.py index fc11d3e73..98d9f5775 100644 --- a/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/random_control.py +++ b/ros2/src/ros2_gym_pybullet_drones/ros2_gym_pybullet_drones/random_control.py @@ -4,9 +4,12 @@ It publishes random RPMs on topic 'action'. """ import sys, os # See: https://github.com/utiasDSL/gym-pybullet-drones/issues/89 +import getpass sys.path.append(sys.path[0].replace("ros2/install/ros2_gym_pybullet_drones/lib/ros2_gym_pybullet_drones", "")) -sys.path.append("/Users/"+os.getlogin()+"/opt/anaconda3/envs/drones/lib/python3.8/site-packages") # macOS -# sys.path.append("/home/"+os.getlogin()+"/anaconda3/envs/drones/lib/python3.8/site-packages") # Ubuntu +if sys.platform == 'darwin': # macOS + sys.path.append("/Users/"+os.getlogin()+"/opt/anaconda3/envs/drones/lib/python3.8/site-packages") +elif sys.platform == 'linux': # Ubuntu + sys.path.append("/home/"+getpass.getuser()+"/anaconda3/envs/drones/lib/python3.8/site-packages") import rclpy import random