diff --git a/bin-shared/send_master.sh b/bin-shared/send_master.sh index 8afd7f3..8d3f6ab 100755 --- a/bin-shared/send_master.sh +++ b/bin-shared/send_master.sh @@ -24,14 +24,19 @@ fi new_dir="${dir//MASTER/clone}" +echo "`date` - Sending '$dir' to" \ + "'$PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_PORT$PROD_DATA_DIR/$new_dir'" + sleep=0 while true; do if (( $sleep > 0 )); then echo "Sleeping for '$sleep' seconds..." sleep $sleep fi - #clone -e 'ssh -p $PROD_DATA_PORT' ./ $PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_DIR/$new_dir - echo "FORTEST - Here's the command: 'clone -e 'ssh -p $PROD_DATA_PORT' ./ $PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_DIR/$new_dir'" + clone -e "ssh -p $PROD_DATA_PORT" ./ \ + $PROD_DATA_USER@$PROD_DATA_HOST:$PROD_DATA_DIR/$new_dir && + echo "`date` - Success!" || + echo "`date` - Failed!" sleep=30 if [[ "$loop" == false ]]; then break; @@ -40,5 +45,5 @@ done ## Complete ## -echo "Done!" +echo "`date` - $PROG complete." exit 0 diff --git a/rc_shared.sh b/rc_shared.sh index 598b3f5..845a260 100644 --- a/rc_shared.sh +++ b/rc_shared.sh @@ -67,7 +67,7 @@ function send-master { send_master.sh; } function goodbye { update -y; bye; } function clone { - rsync -auPhz --delete --exclude '.gradle' --exclude 'app/build' $@ + rsync -auPhz --delete --exclude '.gradle' --exclude 'app/build' "$@" } export -f clone