From d015ade92cf04a54982f097d81749483eef69f68 Mon Sep 17 00:00:00 2001 From: iory Date: Tue, 26 Jul 2022 23:44:29 +0900 Subject: [PATCH] [jsk_unitree_startup/cross] Use sshpass instead of /usr/bin/sshpass --- jsk_unitree_robot/cross/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jsk_unitree_robot/cross/install.sh b/jsk_unitree_robot/cross/install.sh index e05fa2f36f..71614dd20c 100755 --- a/jsk_unitree_robot/cross/install.sh +++ b/jsk_unitree_robot/cross/install.sh @@ -92,9 +92,9 @@ function copy_data () { sshpass -p $PASS ssh -t ${user}@${hostname} "test -e /opt/jsk" || \ sshpass -p $PASS ssh -t ${user}@${hostname} "sudo mkdir -p /opt/jsk && sudo chown -R \$(id -u \${USER}):\$(id -g \${USER}) /opt/jsk && ls -al /opt/jsk" - rsync --rsh="/usr/bin/sshpass -p $PASS ssh -o StrictHostKeyChecking=no -l ${user}" -avz --delete --delete-excluded --exclude "*.pyc" --exclude "^logs/" ${TARGET_MACHINE}_${TARGET_DIRECTORY}/ ${hostname}:/opt/jsk/${TARGET_DIRECTORY} + rsync --rsh="sshpass -p $PASS ssh -o StrictHostKeyChecking=no -l ${user}" -avz --delete --delete-excluded --exclude "*.pyc" --exclude "^logs/" ${TARGET_MACHINE}_${TARGET_DIRECTORY}/ ${hostname}:/opt/jsk/${TARGET_DIRECTORY} if [[ "${TARGET_DIRECTORY}" == "User" ]]; then - rsync --rsh="/usr/bin/sshpass -p $PASS ssh -o StrictHostKeyChecking=no -l ${user}" -avz --delete --delete-excluded ../jsk_unitree_startup/autostart/ ${hostname}:Unitree/autostart/jsk_startup + rsync --rsh="sshpass -p $PASS ssh -o StrictHostKeyChecking=no -l ${user}" -avz --delete --delete-excluded ../jsk_unitree_startup/autostart/ ${hostname}:Unitree/autostart/jsk_startup # https://stackoverflow.com/questions/23395363/make-patch-return-0-when-skipping-an-already-applied-patch # On Air, we need to start unitree_bringup at 129.168.123.13