@@ -160,14 +160,17 @@ function tue-install-rosdep
160160 TUE_INSTALL_CURRENT_TARGET_DIR=$TUE_INSTALL_TARGETS_DIR /$target
161161
162162 # If file exist, target has been resolved correctly in the past.
163- if [ ! -f $TUE_INSTALL_STATE_DIR / $target ]
163+ if [ ! -f " $TUE_INSTALL_STATE_DIR " / " $target " ]
164164 then
165165 tue-install-debug " Target '$target ' has not yet been resolved by rosdep, going to installation procedure"
166166
167167 # Check if target can be resolved by rosdep
168168 tue-install-debug " rosdep resolve $target "
169- rosdep_res=($( rosdep resolve $target 2>&1 ) )
170- if [ $? -eq 0 ]
169+ local rosdep_res rosdep_return_code
170+ rosdep_res=$( rosdep resolve " $target " 2>&1 )
171+ rosdep_return_code=$?
172+ read -r -a rosdep_res <<< rosdep_res
173+ if [ $rosdep_return_code -eq 0 ]
171174 then
172175 tue-install-debug " rosdep correctly resolved to: ${rosdep_res[*]} "
173176
@@ -195,15 +198,15 @@ function tue-install-rosdep
195198 ;;
196199 esac
197200
198- if [[ ${rosdep [1]} == " ros-" * ]]
201+ if [[ ${rosdep_res [1]} == " ros-" * ]]
199202 then
200203 # Also make sure ros is installed
201204 tue-install-target ros || tue-install-error " Failed to install target 'ROS'"
202205 fi
203206
204- _set_dependencies $parent_target $target
207+ _set_dependencies " $parent_target " " $target "
205208
206- touch $TUE_INSTALL_STATE_DIR / $target
209+ touch " $TUE_INSTALL_STATE_DIR " / " $target "
207210
208211 TUE_INSTALL_CURRENT_TARGET=$parent_target
209212 TUE_INSTALL_CURRENT_TARGET_DIR=$TUE_INSTALL_TARGETS_DIR /$parent_target
@@ -217,7 +220,7 @@ function tue-install-rosdep
217220 else
218221 tue-install-debug " Target '$target ' already resolved correctly by rosdep, skipping it this time."
219222
220- _set_dependencies $parent_target $target
223+ _set_dependencies " $parent_target " " $target "
221224
222225 TUE_INSTALL_CURRENT_TARGET=$parent_target
223226 TUE_INSTALL_CURRENT_TARGET_DIR=$TUE_INSTALL_TARGETS_DIR /$parent_target
@@ -238,14 +241,13 @@ function tue-install-target
238241 tue-install-debug " Installing $target "
239242
240243 # Check if valid target received as input
241- if [ ! -d $TUE_INSTALL_TARGETS_DIR / $target ]
244+ if [ ! -d " $TUE_INSTALL_TARGETS_DIR " / " $target " ]
242245 then
243246 # Targets starting with 'ros-' will never be resolved by rosdep
244247 if [[ " $target " != " ros-" * ]]
245248 then
246249 # Check if can be resolved by rosdep
247- tue-install-rosdep $target
248- if [ $? -eq 0 ]
250+ if tue-install-rosdep " $target " " $now "
249251 then
250252 return 0
251253 else
@@ -263,7 +265,7 @@ function tue-install-target
263265 TUE_INSTALL_CURRENT_TARGET=$target
264266 TUE_INSTALL_CURRENT_TARGET_DIR=$TUE_INSTALL_TARGETS_DIR /$target
265267
266- _set_dependencies $parent_target $target
268+ _set_dependencies " $parent_target " " $target "
267269
268270 local state_file state_file_now
269271 state_file=" $TUE_INSTALL_STATE_DIR " /" $target "
0 commit comments