@@ -53,9 +53,9 @@ if [[ ! -d $log_path ]]; then
53
53
fi
54
54
55
55
@ [if interface ]@
56
- export ROS_IP = ` rosrun robot_upstart getifip @(interface )`
56
+ export ROS_IP = ` ros2 run robot_upstart getifip @(interface )`
57
57
if [ " $ROS_IP" = " " ]; then
58
- log err " @(name): No IP address on @(interface), cannot roslaunch ."
58
+ log err " @(name): No IP address on @(interface), cannot ros2 launch ."
59
59
exit 1
60
60
fi
61
61
@ [else ]@
@@ -75,10 +75,10 @@ log info "@(name): Launching ROS_HOSTNAME=$ROS_HOSTNAME, ROS_IP=$ROS_IP, ROS_MAS
75
75
# If xacro files are present in job folder, generate and expand an amalgamated urdf.
76
76
XACRO_FILENAME = $log_path/ @ (name).xacro
77
77
XACRO_ROBOT_NAME = $ (echo " @(name)" | cut - d- - f1)
78
- rosrun robot_upstart mkxacro $JOB_FOLDER $XACRO_ROBOT_NAME > $XACRO_FILENAME
78
+ ros2 run robot_upstart mkxacro $JOB_FOLDER $XACRO_ROBOT_NAME > $XACRO_FILENAME
79
79
if [[ " $?" == " 0" ]]; then
80
80
URDF_FILENAME = $log_path/ @ (name).urdf
81
- rosrun xacro xacro $XACRO_FILENAME - o $URDF_FILENAME
81
+ ros2 run xacro xacro $XACRO_FILENAME - o $URDF_FILENAME
82
82
if [[ " $?" == " 0" ]]; then
83
83
log info " @(name): Generated URDF: $URDF_FILENAME"
84
84
else
@@ -88,10 +88,10 @@ if [[ "$?" == "0" ]]; then
88
88
fi
89
89
90
90
# Assemble amalgamated launchfile.
91
- LAUNCH_FILENAME = $log_path/ @ (name).launch
92
- rosrun robot_upstart mklaunch $JOB_FOLDER > $LAUNCH_FILENAME
91
+ LAUNCH_FILENAME = $log_path/ @ (name).launch . py
92
+ ros2 run robot_upstart mklaunch $JOB_FOLDER > $LAUNCH_FILENAME
93
93
if [[ " $?" != " 0" ]]; then
94
- log err " @(name): Unable to generate amalgamated launchfile."
94
+ log err " @(name): Unable to generate amalgamated launchfile. $JOB_FOLDER $LAUNCH_FILENAME "
95
95
exit 1
96
96
fi
97
97
log info " @(name): Generated launchfile: $LAUNCH_FILENAME"
@@ -104,10 +104,10 @@ if [ "$?" != "0" ]; then
104
104
fi
105
105
106
106
# Punch it.
107
- setpriv -- reuid @ (user) -- regid @ (user) -- init - groups roslaunch $LAUNCH_FILENAME @ (roslaunch_wait? ' --wait ' )&
107
+ setpriv -- reuid @ (user) ros2 launch $LAUNCH_FILENAME @ (roslaunch_wait? ' --wait ' )&
108
108
PID = $!
109
109
110
- log info " @(name): Started roslaunch as background process, PID $PID, ROS_LOG_DIR=$ROS_LOG_DIR"
110
+ log info " @(name): Started ros2 launch as background process, PID $PID, ROS_LOG_DIR=$ROS_LOG_DIR"
111
111
echo " $PID" > $log_path/ @ (name).pid
112
112
113
113
wait " $PID"
0 commit comments