diff --git a/deploy/multi/multiple-uav-check.sh b/deploy/multi/multiple-uav-check.sh index cd86efb5effc79c3a76b8e9c6fd3d5e92012f705..fb08898ed3c09e63702660709eeaa688788daa66 100755 --- a/deploy/multi/multiple-uav-check.sh +++ b/deploy/multi/multiple-uav-check.sh @@ -26,8 +26,8 @@ git_sha_compare() echo "${REPO_NAME} ODROID's SHA: ${SHA_ODROID}" echo "${REPO_NAME} SERVER's SHA: ${SHA_SERVER}" exit -1 - else - echo "${REPO_NAME} is up-to-date." + #else + #echo "${REPO_NAME} is up-to-date." fi } @@ -79,7 +79,7 @@ if [ ! -e ${IPS_FILE} ]; then fi pushd ${ACS_ROOT}/acs_ros_ws/src/autonomy-payload >& /dev/null - git pull origin + git fetch origin git checkout master ./ap_master/launch/master.launch git checkout master ./ap_tasks/src/task_runner.py if [ ! -f ./ap_master/launch/master.launch ]; then