From: Francois Fleuret <francois.fleuret@idiap.ch>
Date: Thu, 11 Oct 2018 10:31:38 +0000 (+0200)
Subject: Added some error messages.
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=xremote.git;a=commitdiff_plain;h=8af6bb233cefab32476336fabc39584929c089ba

Added some error messages.
---

diff --git a/xremote.sh b/xremote.sh
index 5536d01..33396bc 100755
--- a/xremote.sh
+++ b/xremote.sh
@@ -35,7 +35,7 @@ function check_remote_is_defined () {
 
 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.
@@ -92,17 +92,24 @@ do
         -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"
+            [[ ${ARG_DIR} ]] || (echo "xremote: Directory missing." && exit 1)
             echo "xremote: remote dir set to ${ARG_DIR}"
             ;;
 
+        --help)
+            help
+            exit 0
+            ;;
+
         *)
-            echo "Unknown option $1"
+            echo "xremote: Unknown option $1"
             exit 1
             ;;
     esac
@@ -111,7 +118,9 @@ done
 
 ######################################################################
 
-[[ -a "$1" ]] || (help && echo >&2 "Cannot find $1" && 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")"