projects
/
xremote.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
9241850
)
Cosmetics.
author
Francois Fleuret
<francois@fleuret.org>
Thu, 14 Sep 2017 14:01:59 +0000
(16:01 +0200)
committer
Francois Fleuret
<francois@fleuret.org>
Thu, 14 Sep 2017 14:01:59 +0000
(16:01 +0200)
xremote.sh
patch
|
blob
|
history
diff --git
a/xremote.sh
b/xremote.sh
index
83f984e
..
dca62c6
100755
(executable)
--- a/
xremote.sh
+++ b/
xremote.sh
@@
-67,7
+67,7
@@
EOF
function cleanup_remote_tmp () {
if [[ "${REMOTE_HOST}" ]] && [[ "${REMOTE_DIR}" ]]
then
function cleanup_remote_tmp () {
if [[ "${REMOTE_HOST}" ]] && [[ "${REMOTE_DIR}" ]]
then
- echo "Clean up remote workdir."
+ echo "
xremote:
Clean up remote workdir."
ssh "${REMOTE_HOST}" "rm -rf \"${REMOTE_DIR}\""
fi
}
ssh "${REMOTE_HOST}" "rm -rf \"${REMOTE_DIR}\""
fi
}
@@
-114,7
+114,7
@@
do
[[ "${REMOTE_DIR}" ]] && (exit "Remote host already defined!" >&2 && exit 1)
REMOTE_HOST="${value}"
[[ "${REMOTE_HOST}" ]] || REMOTE_HOST="${XREMOTE_HOST}"
[[ "${REMOTE_DIR}" ]] && (exit "Remote host already defined!" >&2 && exit 1)
REMOTE_HOST="${value}"
[[ "${REMOTE_HOST}" ]] || REMOTE_HOST="${XREMOTE_HOST}"
- [[ "${REMOTE_HOST}" ]] || (echo "No remote host specified." >&2 && exit 1)
+ [[ "${REMOTE_HOST}" ]] || (echo "
xremote:
No remote host specified." >&2 && exit 1)
REMOTE_DIR="$(ssh </dev/null "${REMOTE_HOST}" mktemp -d /tmp/xremote.from_"$(hostname)_$(date +%Y%m%d-%H%M%S)".XXXXXX)"
;;
esac
REMOTE_DIR="$(ssh </dev/null "${REMOTE_HOST}" mktemp -d /tmp/xremote.from_"$(hostname)_$(date +%Y%m%d-%H%M%S)".XXXXXX)"
;;
esac
@@
-128,7
+128,7
@@
check_remote_is_defined
tar c "${main}" | ssh "${REMOTE_HOST}" "cd \"${REMOTE_DIR}\" && tar mx"
tar c "${main}" | ssh "${REMOTE_HOST}" "cd \"${REMOTE_DIR}\" && tar mx"
-echo "
O
n ${REMOTE_HOST}"
+echo "
xremote: o
n ${REMOTE_HOST}"
if [[ "${REMOTE_EXEC}" ]]
then
if [[ "${REMOTE_EXEC}" ]]
then
@@
-137,14
+137,15
@@
else
REMOTE_COMMAND="./${main}"
fi
REMOTE_COMMAND="./${main}"
fi
-echo "
-------------------
---------------------------------------------------"
+echo "
xremote: -- stdout
---------------------------------------------------"
ssh </dev/null "${REMOTE_HOST}" "cd \"${REMOTE_DIR}\" && ${REMOTE_COMMAND}"
ssh </dev/null "${REMOTE_HOST}" "cd \"${REMOTE_DIR}\" && ${REMOTE_COMMAND}"
-echo "----------------------------------------------------------------------"
######################################################################
# Disable globbing to keep wildcards for the remote side
######################################################################
# Disable globbing to keep wildcards for the remote side
+echo "xremote: -- retrieve results -----------------------------------------"
+
set -f
while read line
set -f
while read line
@@
-164,4
+165,6
@@
done < "${main}"
set +f
set +f
+echo "xremote: -- finished -------------------------------------------------"
+
######################################################################
######################################################################