Merge pull request #1 from k-okada/impr/rtmroswtf

Impr/rtmroswtf
YutaKojio · Jul 13, 2015 · cd64fb6 · cd64fb6
2 parents 7e1274a + 89ba4ac
commit cd64fb6
Showing 1 changed file with 19 additions and 3 deletions.
diff --git a/hrpsys_tools/scripts/rtmroswtf.sh b/hrpsys_tools/scripts/rtmroswtf.sh
@@ -42,7 +42,7 @@ FILENAME_LOG_ALL=/tmp/rtmros_diagnosisinfo_all_`date +"%Y%m%d-%H%M%S"`.tgz
 
 env |grep ROS | tee -a ${FILENAME_LOG_COMMANDS}
 ifconfig | tee -a ${FILENAME_LOG_COMMANDS}
-rosrun rtshell rtls ${CORBA_HOSTNAME}:${CORBA_HOST_PORT}/ 2>&1 | tee -a ${FILENAME_LOG_COMMANDS}
+rtls ${CORBA_HOSTNAME}:${CORBA_HOST_PORT}/ 2>&1 | tee -a ${FILENAME_LOG_COMMANDS}
 ## Get packages' version. Ref. http://askubuntu.com/a/347563/24203
 ## Get rosversion of the same packages
 res_dpkg=$(dpkg -l | grep '^ii' | grep ros- | awk '{print $2 " " $3}')
@@ -58,9 +58,25 @@ do
   if [[ -z "$rospackfind_result" ]]; then
     continue;
   fi
+done
+
+res_dpkg=$(rospack list)
+IFS=$'\n'  # http://askubuntu.com/questions/344407/how-to-read-complete-line-in-for-loop-with-spaces
+for i in ${res_dpkg}
+do
+  p_packagename=$(echo ${i} | awk '{print $1}');
+  printf "* %s ${p_packagename} " 2>&1 | tee -a ${FILENAME_LOG_COMMANDS}
+  rospackfind_result=$(rospack -q find ${p_packagename})
+  printf "%s ${rospackfind_result} " 2>&1 | tee -a ${FILENAME_LOG_COMMANDS}
+  echo "${rospackfind_result}" | grep -o '[^/]*$' | xargs rosversion 2>&1 | tee -a ${FILENAME_LOG_COMMANDS}
+  if [[ -z "$rospackfind_result" ]]; then
+    continue;
+  fi
   # git status
-  cd "${rospackfind_result}"; git_result=$(git status || false)
-  echo $git_result 2>&1 | tee -a ${FILENAME_LOG_COMMANDS}
+  cd "${rospackfind_result}";
+  if [ `git diff 2> /dev/null | wc -l` != "0" ]; then
+      git status | tee -a ${FILENAME_LOG_COMMANDS}
+  fi
   cd $OLDPWD
 done