projects
/
xremote.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added some error messages.
[xremote.git]
/
xremote.sh
diff --git
a/xremote.sh
b/xremote.sh
index
ecf6f3e
..
33396bc
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>] [-i <remote_dir>] <script> [script arguments]
+xremote.sh [-
-help] [-
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.
@@
-92,17
+92,24
@@
do
-h)
shift
ARG_HOST="$1"
-h)
shift
ARG_HOST="$1"
+ [[ ${ARG_HOST} ]] || (echo "xremote: Hostname missing." && exit 1)
echo "xremote: remote forced to ${ARG_HOST}"
;;
-i)
shift
ARG_DIR="$1"
echo "xremote: remote forced to ${ARG_HOST}"
;;
-i)
shift
ARG_DIR="$1"
+ [[ ${ARG_DIR} ]] || (echo "xremote: Directory missing." && exit 1)
echo "xremote: remote dir set to ${ARG_DIR}"
;;
echo "xremote: remote dir set to ${ARG_DIR}"
;;
+ --help)
+ help
+ exit 0
+ ;;
+
*)
*)
- echo "Unknown option $1"
+ echo "
xremote:
Unknown option $1"
exit 1
;;
esac
exit 1
;;
esac
@@
-111,18
+118,22
@@
done
######################################################################
######################################################################
-[[ -a "$1" ]] || (help && exit 1)
+[[ "$1" ]] || (echo "xremote: Script name missing" && exit 1)
+
+[[ -a "$1" ]] || (help && echo >&2 "xremote: Cannot find script \`$1'" && exit 1)
+
+cd "$(dirname "$1")"
main="$(basename "$1")"
main_config="${main}.xremote"
main="$(basename "$1")"
main_config="${main}.xremote"
-if [[
! -f "${main}.xremote
" ]]
+if [[
-f "${main_config}
" ]]
then
then
+ echo "xremote: found ${main_config}"
+else
main_config="${main}"
fi
main_config="${main}"
fi
-cd "$(dirname "$1")"
-
shift
trap cleanup_remote_tmp EXIT
shift
trap cleanup_remote_tmp EXIT
@@
-202,6
+213,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}\""
@@
-236,6
+248,7
@@
do
;;
esac
fi
;;
esac
fi
+
done < "${main_config}"
set +f
done < "${main_config}"
set +f