projects
/
xremote.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OCD cosmetics.
[xremote.git]
/
xremote.sh
diff --git
a/xremote.sh
b/xremote.sh
index
7556470
..
5536d01
100755
(executable)
--- a/
xremote.sh
+++ b/
xremote.sh
@@
-35,7
+35,7
@@
function check_remote_is_defined () {
function help () {
cat <<EOF
function help () {
cat <<EOF
-xremote.sh [-h
remote_host
] <script> [script arguments]
+xremote.sh [-h
<remote_host>] [-i <remote_dir>
] <script> [script arguments]
This script takes a script as argument and executes it remotely in a
temporary directory on a ssh-accessible server.
This script takes a script as argument and executes it remotely in a
temporary directory on a ssh-accessible server.
@@
-56,8
+56,16
@@
xremote.sh [-h remote_host] <script> [script arguments]
@XREMOTE_GET: *.dat
@XREMOTE_PRE: ln -s /home/fleuret/data/pytorch ./data
@XREMOTE_GET: *.dat
@XREMOTE_PRE: ln -s /home/fleuret/data/pytorch ./data
+ If a file with the same name as the script with the .xremote
+ extension appended to it exists, arguments will be read from it by
+ default.
+
If the -h option is provided @XREMOTE_HOST is ignored.
If the -h option is provided @XREMOTE_HOST is ignored.
+ If the -i option is provided, all the files are installed and
+ scripts run in the specified directory on the remote host, but the
+ main executable and post-run commands are ignored
+
If no argument is provided to @XREMOTE_HOST, and the -h option is
not specified, the environment variable \$XREMOTE_HOST is used
instead
If no argument is provided to @XREMOTE_HOST, and the -h option is
not specified, the environment variable \$XREMOTE_HOST is used
instead
@@
-69,10
+77,9
@@
EOF
}
function cleanup_remote_tmp () {
}
function cleanup_remote_tmp () {
- if [[ "${REMOTE_HOST}" ]] && [[ "${REMOTE_DIR}" ]]
+ if [[ "${REMOTE_HOST}" ]] && [[ "${REMOTE_DIR}" ]]
&& [[ ! "${ARG_DIR}" ]]
then
echo "xremote: Clean up remote workdir."
then
echo "xremote: Clean up remote workdir."
- ssh "${REMOTE_HOST}" "rm -rf \"${REMOTE_DIR}\""
fi
}
fi
}
@@
-87,6
+94,13
@@
do
ARG_HOST="$1"
echo "xremote: remote forced to ${ARG_HOST}"
;;
ARG_HOST="$1"
echo "xremote: remote forced to ${ARG_HOST}"
;;
+
+ -i)
+ shift
+ ARG_DIR="$1"
+ echo "xremote: remote dir set to ${ARG_DIR}"
+ ;;
+
*)
echo "Unknown option $1"
exit 1
*)
echo "Unknown option $1"
exit 1
@@
-97,11
+111,19
@@
done
######################################################################
######################################################################
-[[ -a "$1" ]] || (help && exit 1)
+[[ -a "$1" ]] || (help && echo >&2 "Cannot find $1" && exit 1)
+
+cd "$(dirname "$1")"
main="$(basename "$1")"
main="$(basename "$1")"
+main_config="${main}.xremote"
-cd "$(dirname "$1")"
+if [[ -f "${main_config}" ]]
+then
+ echo "xremote: found ${main_config}"
+else
+ main_config="${main}"
+fi
shift
shift
@@
-144,13
+166,19
@@
do
[[ "${REMOTE_HOST}" ]] || REMOTE_HOST="${value}"
[[ "${REMOTE_HOST}" ]] || REMOTE_HOST="${XREMOTE_HOST}"
[[ "${REMOTE_HOST}" ]] || (echo "xremote: No remote host specified." >&2 && exit 1)
[[ "${REMOTE_HOST}" ]] || REMOTE_HOST="${value}"
[[ "${REMOTE_HOST}" ]] || REMOTE_HOST="${XREMOTE_HOST}"
[[ "${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)"
+ if [[ "${ARG_DIR}" ]]
+ then
+ ssh </dev/null "${REMOTE_HOST}" "mkdir -p \"${ARG_DIR}\""
+ REMOTE_DIR="${ARG_DIR}"
+ else
+ REMOTE_DIR="$(ssh </dev/null "${REMOTE_HOST}" mktemp -d /tmp/xremote_\$\(whoami\)_from_"$(hostname)_$(date +%Y%m%d_%H%M%S)".XXXXXX)"
+ fi
echo "xremote: target is ${REMOTE_HOST}"
;;
esac
fi
echo "xremote: target is ${REMOTE_HOST}"
;;
esac
fi
-done < "${main}"
+done < "${main
_config
}"
######################################################################
######################################################################
@@
-158,6
+186,12
@@
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"
+if [[ "${ARG_DIR}" ]]
+then
+ echo "xremote: everything has been set up in ${REMOTE_HOST}:${ARG_DIR}"
+ exit 0
+fi
+
echo "xremote: -- running the executable -----------------------------------"
if [[ "${REMOTE_EXEC}" ]]
echo "xremote: -- running the executable -----------------------------------"
if [[ "${REMOTE_EXEC}" ]]
@@
-170,6
+204,7
@@
fi
######################################################################
# I find this slightly ugly ...
######################################################################
# I find this slightly ugly ...
+
for s in "$@"
do
quoted_args="${quoted_args} \"${s}\""
for s in "$@"
do
quoted_args="${quoted_args} \"${s}\""
@@
-204,7
+239,8
@@
do
;;
esac
fi
;;
esac
fi
-done < "${main}"
+
+done < "${main_config}"
set +f
set +f