@@ -158,14 +158,17 @@ function tue-install-rosdep
158158 TUE_INSTALL_CURRENT_TARGET_DIR=$TUE_INSTALL_TARGETS_DIR /$target
159159
160160 # If file exist, target has been resolved correctly in the past.
161- if [ ! -f $TUE_INSTALL_STATE_DIR / $target ]
161+ if [ ! -f " $TUE_INSTALL_STATE_DIR " / " $target " ]
162162 then
163163 tue-install-debug " Target '$target ' has not yet been resolved by rosdep, going to installation procedure"
164164
165165 # Check if target can be resolved by rosdep
166166 tue-install-debug " rosdep resolve $target "
167- rosdep_res=($( rosdep resolve $target 2>&1 ) )
168- if [ $? -eq 0 ]
167+ local rosdep_res rosdep_return_code
168+ rosdep_res=$( rosdep resolve " $target " 2>&1 )
169+ rosdep_return_code=$?
170+ read -r -a rosdep_res <<< rosdep_res
171+ if [ $rosdep_return_code -eq 0 ]
169172 then
170173 tue-install-debug " rosdep correctly resolved to: ${rosdep_res[*]} "
171174
@@ -193,15 +196,15 @@ function tue-install-rosdep
193196 ;;
194197 esac
195198
196- if [[ ${rosdep [1]} == " ros-" * ]]
199+ if [[ ${rosdep_res [1]} == " ros-" * ]]
197200 then
198201 # Also make sure ros is installed
199202 tue-install-target ros || tue-install-error " Failed to install target 'ROS'"
200203 fi
201204
202- _set_dependencies $parent_target $target
205+ _set_dependencies " $parent_target " " $target "
203206
204- touch $TUE_INSTALL_STATE_DIR / $target
207+ touch " $TUE_INSTALL_STATE_DIR " / " $target "
205208
206209 TUE_INSTALL_CURRENT_TARGET=$parent_target
207210 TUE_INSTALL_CURRENT_TARGET_DIR=$TUE_INSTALL_TARGETS_DIR /$parent_target
@@ -215,7 +218,7 @@ function tue-install-rosdep
215218 else
216219 tue-install-debug " Target '$target ' already resolved correctly by rosdep, skipping it this time."
217220
218- _set_dependencies $parent_target $target
221+ _set_dependencies " $parent_target " " $target "
219222
220223 TUE_INSTALL_CURRENT_TARGET=$parent_target
221224 TUE_INSTALL_CURRENT_TARGET_DIR=$TUE_INSTALL_TARGETS_DIR /$parent_target
@@ -235,14 +238,13 @@ function tue-install-target
235238 tue-install-debug " Installing $target "
236239
237240 # Check if valid target received as input
238- if [ ! -d $TUE_INSTALL_TARGETS_DIR / $target ]
241+ if [ ! -d " $TUE_INSTALL_TARGETS_DIR " / " $target " ]
239242 then
240243 # Targets starting with 'ros-' will never be resolved by rosdep
241244 if [[ " $target " != " ros-" * ]]
242245 then
243246 # Check if can be resolved by rosdep
244- tue-install-rosdep $target
245- if [ $? -eq 0 ]
247+ if tue-install-rosdep " $target " " $now "
246248 then
247249 return 0
248250 else
@@ -259,7 +261,7 @@ function tue-install-target
259261 TUE_INSTALL_CURRENT_TARGET=$target
260262 TUE_INSTALL_CURRENT_TARGET_DIR=$TUE_INSTALL_TARGETS_DIR /$target
261263
262- _set_dependencies $parent_target $target
264+ _set_dependencies " $parent_target " " $target "
263265
264266 local state_file=" $TUE_INSTALL_STATE_DIR " /" $target "
265267 local state_file_now=" ${state_file} -now"
0 commit comments