diff options
| author | Paul C. Buetow (mars.fritz.box) <paul@buetow.org> | 2014-06-21 10:55:15 +0200 |
|---|---|---|
| committer | Paul C. Buetow (mars.fritz.box) <paul@buetow.org> | 2014-06-21 10:55:15 +0200 |
| commit | 37495f6a25861303d2c6fa96acdcc97ee572f3e6 (patch) | |
| tree | 9a5937d2178f6452a15dc0c6a7fbf4e2d2d50bbc | |
| parent | 288033bd4ef00dcb8a171e073fb25c24e1d2fcdd (diff) | |
add default conf
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | src/netdiff | 23 | ||||
| -rw-r--r-- | src/netdiff.default.conf | 2 |
3 files changed, 18 insertions, 11 deletions
@@ -14,11 +14,13 @@ install: test ! -d $(DESTDIR)/usr/bin && mkdir -p $(DESTDIR)/usr/bin || exit 0 test ! -d $(DESTDIR)/usr/share/$(NAME) && mkdir -p $(DESTDIR)/usr/share/$(NAME) || exit 0 cp ./bin/* $(DESTDIR)/usr/bin - #cp -r ./lib $(DESTDIR)/usr/share/$(NAME)/lib + test ! -d $(DESTDIR)/etc/default && mkdir -p $(DESTDIR)/etc/default || exit 0 + cp ./src/netdiff.default.conf $(DESTDIR)/etc/default/netdiff deinstall: test ! -z "$(DESTDIR)" && test -f $(DESTDIR)/usr/bin/$(NAME) && rm $(DESTDIR)/usr/bin/$(NAME) || exit 0 test ! -z "$(DESTDIR)/usr/share/$(NAME)" && -d $(DESTDIR)/usr/share/$(NAME) && rm -r $(DESTDIR)/usr/share/$(NAME) || exit 0 + test ! -z "$(DESTDIR)" && test -f $(DESTDIR)/etc/default/netdiff && rm $(DESTDIR)/etc/default/netdiff || exit 0 clean: rm bin/* diff --git a/src/netdiff b/src/netdiff index 3cd8493..e666154 100755 --- a/src/netdiff +++ b/src/netdiff @@ -6,9 +6,10 @@ declare -r VERSION='VERSION_DEVEL' declare -i RC=0 -declare -r SERVER="${1}" ; shift -declare -r WHAT="${1}" ; shift -declare -i PORT="${1}" ; shift +declare -r SERVER="${1}" ; shift +declare -r WHAT="${1}" ; shift +declare -i PORT="${1}" ; shift +declare DIFF_OPTS="${1}" ; shift usage () { @@ -18,15 +19,16 @@ This is NetDiff ${VERSION}. Usage: USAGE } +[ -f /etc/default/netdiff ] && source /etc/default/netdiff + [ -z "${WHAT}" ] && usage && exit 0 -if [[ -z "${PORT}" || ${PORT} == 0 ]]; then - PORT=1234 - declare -r DIFF_DEFAULT_OPTS='--unified --recursive' -fi +[ -z "${DIFF_OPTS}" ] && DIFF_OPTS="${DEFAULT_DIFF_OPTS}" -declare -r TMPWHAT=$(mktemp --directory) +[[ -z "${PORT}" || ${PORT} == 0 ]] && PORT=${DEFAULT_PORT} +declare -r TMPWHAT=$(mktemp --directory) declare -r BASENAME=$(basename "${WHAT}") + cd $(dirname "${WHAT}") set -o pipefail @@ -47,9 +49,10 @@ fi if [ ${RC} -ne 0 ]; then echo 'Could not copy file via the network' - RC=2 # Default trouble exit status of diff + # Default trouble exit status of diff + RC=2 else - diff $@ "${WHAT}" ${TMPWHAT} ${DIFF_DEFAULT_OPTS} + diff $@ "${WHAT}" ${TMPWHAT} ${DIFF_OPTS} RC=$? fi diff --git a/src/netdiff.default.conf b/src/netdiff.default.conf new file mode 100644 index 0000000..0560fab --- /dev/null +++ b/src/netdiff.default.conf @@ -0,0 +1,2 @@ +DEFAULT_PORT=1234 +DEFAULT_DIFF_OPTS='--unified --recursive' |