[rosbridge] fix removal of source repo (#347)

Author: MatthijsBurgh

ros-rosapi/install.bash

@@ -10,19 +10,24 @@ pkg_dir="${TUE_SYSTEM_DIR}/src/${pkg}"
 if [ -e "${pkg_dir}" ]
 then
     tue-install-debug "Source pkg found in the workspace, removing it, so the system installed version is used"
-    repo_dir=$(git -C "$(realpath "${pkg_dir}")" rev-parse --show-toplevel)
     tue-install-pipe rm "$TUE_SYSTEM_DIR/src/${pkg}"
 
+    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
+else
+    tue-install-debug "Source pkg already removed"
+fi
+
+repo_dir=$(_git_url_to_repos_dir "https://github.com/RobotWebTools/rosbridge_suite.git")
+if [ -n "${repo_dir}" ] && [ -d "${repo_dir}" ]
+then
     links=$(find "$TUE_SYSTEM_DIR"/src -lname "${repo_dir}*")
     if [ -n "${repo_dir}" ] && [ -z "${links}" ]
     then
         tue-install-debug "No symlinks left to repo or a sub-folder of it, deleting it"
-        # tue-install-pipe rm -rf "${repo_dir}"
+        tue-install-pipe rm -rf "${repo_dir}"
     else
         tue-install-debug "Keeping the repo as there still exist symlinks to it in the workspace"
     fi
-
-    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
 else
-    tue-install-debug "Source pkg already removed"
+    tue-install-debug "Repo already removed"
 fi

ros-rosbridge_library/install.bash

@@ -10,19 +10,24 @@ pkg_dir="${TUE_SYSTEM_DIR}/src/${pkg}"
 if [ -e "${pkg_dir}" ]
 then
     tue-install-debug "Source pkg found in the workspace, removing it, so the system installed version is used"
-    repo_dir=$(git -C "$(realpath "${pkg_dir}")" rev-parse --show-toplevel)
     tue-install-pipe rm "$TUE_SYSTEM_DIR/src/${pkg}"
 
+    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
+else
+    tue-install-debug "Source pkg already removed"
+fi
+
+repo_dir=$(_git_url_to_repos_dir "https://github.com/RobotWebTools/rosbridge_suite.git")
+if [ -n "${repo_dir}" ] && [ -d "${repo_dir}" ]
+then
     links=$(find "$TUE_SYSTEM_DIR"/src -lname "${repo_dir}*")
     if [ -n "${repo_dir}" ] && [ -z "${links}" ]
     then
         tue-install-debug "No symlinks left to repo or a sub-folder of it, deleting it"
-        # tue-install-pipe rm -rf "${repo_dir}"
+        tue-install-pipe rm -rf "${repo_dir}"
     else
         tue-install-debug "Keeping the repo as there still exist symlinks to it in the workspace"
     fi
-
-    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
 else
-    tue-install-debug "Source pkg already removed"
+    tue-install-debug "Repo already removed"
 fi

ros-rosbridge_msgs/install.bash

@@ -10,19 +10,24 @@ pkg_dir="${TUE_SYSTEM_DIR}/src/${pkg}"
 if [ -e "${pkg_dir}" ]
 then
     tue-install-debug "Source pkg found in the workspace, removing it, so the system installed version is used"
-    repo_dir=$(git -C "$(realpath "${pkg_dir}")" rev-parse --show-toplevel)
     tue-install-pipe rm "$TUE_SYSTEM_DIR/src/${pkg}"
 
+    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
+else
+    tue-install-debug "Source pkg already removed"
+fi
+
+repo_dir=$(_git_url_to_repos_dir "https://github.com/RobotWebTools/rosbridge_suite.git")
+if [ -n "${repo_dir}" ] && [ -d "${repo_dir}" ]
+then
     links=$(find "$TUE_SYSTEM_DIR"/src -lname "${repo_dir}*")
     if [ -n "${repo_dir}" ] && [ -z "${links}" ]
     then
         tue-install-debug "No symlinks left to repo or a sub-folder of it, deleting it"
-        # tue-install-pipe rm -rf "${repo_dir}"
+        tue-install-pipe rm -rf "${repo_dir}"
     else
         tue-install-debug "Keeping the repo as there still exist symlinks to it in the workspace"
     fi
-
-    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
 else
-    tue-install-debug "Source pkg already removed"
+    tue-install-debug "Repo already removed"
 fi

ros-rosbridge_server/install.bash

@@ -10,19 +10,24 @@ pkg_dir="${TUE_SYSTEM_DIR}/src/${pkg}"
 if [ -e "${pkg_dir}" ]
 then
     tue-install-debug "Source pkg found in the workspace, removing it, so the system installed version is used"
-    repo_dir=$(git -C "$(realpath "${pkg_dir}")" rev-parse --show-toplevel)
     tue-install-pipe rm "$TUE_SYSTEM_DIR/src/${pkg}"
 
+    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
+else
+    tue-install-debug "Source pkg already removed"
+fi
+
+repo_dir=$(_git_url_to_repos_dir "https://github.com/RobotWebTools/rosbridge_suite.git")
+if [ -n "${repo_dir}" ] && [ -d "${repo_dir}" ]
+then
     links=$(find "$TUE_SYSTEM_DIR"/src -lname "${repo_dir}*")
     if [ -n "${repo_dir}" ] && [ -z "${links}" ]
     then
         tue-install-debug "No symlinks left to repo or a sub-folder of it, deleting it"
-        # tue-install-pipe rm -rf "${repo_dir}"
+        tue-install-pipe rm -rf "${repo_dir}"
     else
         tue-install-debug "Keeping the repo as there still exist symlinks to it in the workspace"
     fi
-
-    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
 else
-    tue-install-debug "Source pkg already removed"
+    tue-install-debug "Repo already removed"
 fi

ros-rosbridge_suite/install.bash

@@ -10,19 +10,24 @@ pkg_dir="${TUE_SYSTEM_DIR}/src/${pkg}"
 if [ -e "${pkg_dir}" ]
 then
     tue-install-debug "Source pkg found in the workspace, removing it, so the system installed version is used"
-    repo_dir=$(git -C "$(realpath "${pkg_dir}")" rev-parse --show-toplevel)
     tue-install-pipe rm "$TUE_SYSTEM_DIR/src/${pkg}"
 
+    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
+else
+    tue-install-debug "Source pkg already removed"
+fi
+
+repo_dir=$(_git_url_to_repos_dir "https://github.com/RobotWebTools/rosbridge_suite.git")
+if [ -n "${repo_dir}" ] && [ -d "${repo_dir}" ]
+then
     links=$(find "$TUE_SYSTEM_DIR"/src -lname "${repo_dir}*")
     if [ -n "${repo_dir}" ] && [ -z "${links}" ]
     then
         tue-install-debug "No symlinks left to repo or a sub-folder of it, deleting it"
-        # tue-install-pipe rm -rf "${repo_dir}"
+        tue-install-pipe rm -rf "${repo_dir}"
     else
         tue-install-debug "Keeping the repo as there still exist symlinks to it in the workspace"
     fi
-
-    tue-install-pipe catkin clean --workspace "${TUE_SYSTEM_DIR}" --orphans
 else
-    tue-install-debug "Source pkg already removed"
+    tue-install-debug "Repo already removed"
 fi