From 288033bd4ef00dcb8a171e073fb25c24e1d2fcdd Mon Sep 17 00:00:00 2001
From: "Paul C. Buetow (mars.fritz.box)" <paul@buetow.org>
Date: Sat, 21 Jun 2014 10:46:18 +0200
Subject: diffing actually works now again

---
 src/netdiff | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/netdiff b/src/netdiff
index 9bba61f..3cd8493 100755
--- a/src/netdiff
+++ b/src/netdiff
@@ -7,36 +7,41 @@ declare -r VERSION='VERSION_DEVEL'
 declare -i RC=0
 
 declare -r SERVER="${1}" ; shift
-declare -r PATH="${1}"   ; shift
+declare -r WHAT="${1}"   ; shift
 declare -i PORT="${1}"   ; shift
 
+
 usage () {
   cat <<USAGE
 This is NetDiff ${VERSION}. Usage:
-  netdiff SERVER PATH [PORT=1234] [DIFF OPTS]
+  netdiff SERVER WHAT [PORT=1234] [DIFF OPTS]
 USAGE
 }
 
-[ -z "${PATH}" ] && usage && exit 0
+[ -z "${WHAT}" ] && usage && exit 0
 if [[ -z "${PORT}" || ${PORT} == 0 ]]; then
   PORT=1234
   declare -r DIFF_DEFAULT_OPTS='--unified --recursive'
 fi
 
-declare -r TMPPATH=$(mktemp --directory)
-set -e pipefail
+declare -r TMPWHAT=$(mktemp --directory)
+
+declare -r BASENAME=$(basename "${WHAT}")
+cd $(dirname "${WHAT}")
+
+set -o pipefail
 
 if [[ "${SERVER}" == "$(hostname)" || 
   "${SERVER}" == "$(hostname --fqdn)" ]]; then
-  tar -cf - . --directory "${PATH}" |
+  tar -cf - "${BASENAME}" |
   nc -l -p ${PORT} |
-  tar -xf - --directory ${TMPPATH}
+  tar -xf - --directory ${TMPWHAT}
   RC=$?
 else
   sleep 0.1
-  tar -cf - . --directory "${PATH}" |
+  tar -cf - "${BASENAME}" |
   nc ${SERVER} ${PORT} |
-  tar -xf - --directory ${TMPPATH}
+  tar -xf - --directory ${TMPWHAT}
   RC=$?
 fi
 
@@ -44,10 +49,10 @@ if [ ${RC} -ne 0 ]; then
   echo 'Could not copy file via the network'
   RC=2 # Default trouble exit status of diff 
 else
-  diff $@ "${PATH}" ${TMPPATH} ${DIFF_DEFAULT_OPTS}
+  diff $@ "${WHAT}" ${TMPWHAT} ${DIFF_DEFAULT_OPTS}
   RC=$?
 fi
 
-[ -f ${TMPPATH} ] && rm -rf ${TMPPATH}
+[ -f ${TMPWHAT} ] && rm -rf ${TMPWHAT}
 exit ${RC}
 
-- 
cgit v1.2.3