From: Francois Fleuret <francois.fleuret@idiap.ch>
Date: Tue, 5 Mar 2019 07:49:34 +0000 (+0100)
Subject: Replaced -i with -d and -i.
X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=commitdiff_plain;h=d3573a6c2b63d56d94c6b71732632f37b8a9a3cc;p=xremote.git

Replaced -i with -d and -i.
---

diff --git a/README.md b/README.md
index 6480805..f152214 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@ This is a very simple bash script to run scripts on a remote machine
 accessible by ssh, send required files, and get back result files
 transparently.
 
-It creates a temporary files in /tmp/ on the remote host and runs
+It creates a temporary directory in /tmp/ on the remote host and runs
 everything in it.
 
 I use it mostly to launch heavy training with PyTorch on a PC at home.
diff --git a/xremote.sh b/xremote.sh
index 33396bc..7ebc0d4 100755
--- a/xremote.sh
+++ b/xremote.sh
@@ -35,7 +35,7 @@ function check_remote_is_defined () {
 
 function help () {
     cat <<EOF
-xremote.sh [--help] [-h <remote_host>] [-i <remote_dir>] <script> [script arguments]
+xremote.sh [--help] [-h <remote_host>] [-d <remote_dir>] [-i] <script> [script arguments]
 
   This script takes a script as argument and executes it remotely in a
   temporary directory on a ssh-accessible server.
@@ -62,6 +62,9 @@ xremote.sh [--help] [-h <remote_host>] [-i <remote_dir>] <script> [script argume
 
   If the -h option is provided @XREMOTE_HOST is ignored.
 
+  If the -d option is provided, the provided directory is used and
+  kept, instead of a temporary one
+
   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
@@ -77,9 +80,15 @@ EOF
 }
 
 function cleanup_remote_tmp () {
-    if [[ "${REMOTE_HOST}" ]] && [[ "${REMOTE_DIR}" ]] && [[ ! "${ARG_DIR}" ]]
+    if [[ "${REMOTE_HOST}" ]] && [[ "${REMOTE_DIR}" ]]
     then
-        echo "xremote: Clean up remote workdir."
+        if [[ "${ARG_DIR}" ]]
+        then
+            echo "xremote: Keeping remote workdir."
+        else
+            echo "xremote: Cleaning up temporary remote workdir."
+            ssh "${REMOTE_HOST}" rm -rf "${REMOTE_DIR}"
+        fi
     fi
 }
 
@@ -96,13 +105,18 @@ do
             echo "xremote: remote forced to ${ARG_HOST}"
             ;;
 
-        -i)
+        -d)
             shift
             ARG_DIR="$1"
             [[ ${ARG_DIR} ]] || (echo "xremote: Directory missing." && exit 1)
             echo "xremote: remote dir set to ${ARG_DIR}"
             ;;
 
+        -i)
+            NO_RUN=1
+            echo "xremote: no run"
+            ;;
+
         --help)
             help
             exit 0
@@ -195,7 +209,7 @@ check_remote_is_defined
 
 tar c "${main}" | ssh "${REMOTE_HOST}" "cd \"${REMOTE_DIR}\" && tar mx"
 
-if [[ "${ARG_DIR}" ]]
+if [[ "${NO_RUN}" ]]
 then
     echo "xremote: everything has been set up in ${REMOTE_HOST}:${ARG_DIR}"
     exit 0