Remove source

Author: javizqh

manager/manager/launcher/launcher_gzsim_view.py

@@ -29,7 +29,6 @@ def run(self, config_file, callback):
         if config_file is None:
             config_file = "/opt/jderobot/Launchers/visualization/default.config"
 
-        enviroment = "source /.env;"
         # Configure browser screen width and height for gz GUI
         gzclient_config_cmds = f"sed -i 's/<width>.*<\/width>/<width>{self.width}<\/width>/; s/<height>.*<\/height>/<height>{self.height}<\/height>/' {config_file};"
 
@@ -39,12 +38,12 @@ def run(self, config_file, callback):
                 self.display, self.internal_port, self.external_port, DRI_PATH
             )
             # Write display config and start gzclient
-            gzclient_cmd = f"{enviroment}export DISPLAY={self.display}; {gzclient_config_cmds} export VGL_DISPLAY={DRI_PATH}; vglrun gz sim -g -v4 --gui-config {config_file}"
+            gzclient_cmd = f"export DISPLAY={self.display}; {gzclient_config_cmds} export VGL_DISPLAY={DRI_PATH}; vglrun gz sim -g -v4 --gui-config {config_file}"
         else:
             # Starts xserver, x11vnc and novnc
             self.gz_vnc.start_vnc(self.display, self.internal_port, self.external_port)
             # Write display config and start gzclient
-            gzclient_cmd = f"{enviroment}export DISPLAY={self.display}; {gzclient_config_cmds} gz sim -g -v4 --gui-config {config_file}"
+            gzclient_cmd = f"export DISPLAY={self.display}; {gzclient_config_cmds} gz sim -g -v4 --gui-config {config_file}"
 
         gzclient_thread = DockerThread(gzclient_cmd)
         gzclient_thread.start()

manager/manager/launcher/launcher_robot_ros2_api.py

@@ -22,8 +22,6 @@ def run(self, robot_pose, callback):
 
         logging.getLogger("roslaunch").setLevel(logging.CRITICAL)
 
-        enviroment = "source /.env;"
-
         xserver_cmd = f"/usr/bin/Xorg -quiet -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./xdummy.log -config ./xorg.conf :0"
         xserver_thread = DockerThread(xserver_cmd)
         xserver_thread.start()
@@ -33,10 +31,10 @@ def run(self, robot_pose, callback):
 
         if ACCELERATION_ENABLED:
             exercise_launch_cmd = (
-                f"{enviroment}export VGL_DISPLAY={DRI_PATH}; vglrun {ROBOT_POSE} ros2 launch {self.launch_file}"
+                f"export VGL_DISPLAY={DRI_PATH}; vglrun {ROBOT_POSE} ros2 launch {self.launch_file}"
             )
         else:
-            exercise_launch_cmd = f"{enviroment}{ROBOT_POSE} ros2 launch {self.launch_file}"
+            exercise_launch_cmd = f"{ROBOT_POSE} ros2 launch {self.launch_file}"
 
         exercise_launch_thread = DockerThread(exercise_launch_cmd)
         exercise_launch_thread.start()