aboutsummaryrefslogtreecommitdiffstats
path: root/testing/simplesnap/0001-fix-simplesnap-line-2-dotlockfile-command-not-found.patch
diff options
context:
space:
mode:
Diffstat (limited to 'testing/simplesnap/0001-fix-simplesnap-line-2-dotlockfile-command-not-found.patch')
-rw-r--r--testing/simplesnap/0001-fix-simplesnap-line-2-dotlockfile-command-not-found.patch66
1 files changed, 66 insertions, 0 deletions
diff --git a/testing/simplesnap/0001-fix-simplesnap-line-2-dotlockfile-command-not-found.patch b/testing/simplesnap/0001-fix-simplesnap-line-2-dotlockfile-command-not-found.patch
new file mode 100644
index 0000000000..2c2954ff7e
--- /dev/null
+++ b/testing/simplesnap/0001-fix-simplesnap-line-2-dotlockfile-command-not-found.patch
@@ -0,0 +1,66 @@
+From f477a6895512c77eef3637581ab36ad8319a0204 Mon Sep 17 00:00:00 2001
+From: Henrik Riomar <henrik.riomar@gmail.com>
+Date: Mon, 18 Jun 2018 19:15:54 +0200
+Subject: [PATCH] fix: simplesnap: line 2??: dotlockfile: command not found
+
+Closes: #12
+---
+ simplesnap | 28 +++++++++-------------------
+ 1 file changed, 9 insertions(+), 19 deletions(-)
+
+diff --git a/simplesnap b/simplesnap
+index 6d60885..63fc0c2 100755
+--- a/simplesnap
++++ b/simplesnap
+@@ -149,15 +149,11 @@ done
+ SSHCMD="${SSHCMD:-ssh}"
+ WRAPCMD="${WRAPCMD:-simplesnapwrap}"
+
+-DATE="gdate"
+-gdate &> /dev/null || [ $? -eq 127 ] && DATE="date"
+-SED="gsed"
+-gsed &> /dev/null || [ $? -eq 127 ] && SED="sed"
+-GREP="ggrep"
+-ggrep &> /dev/null || [ $? -eq 127 ] && GREP="grep"
+-HEAD="ghead"
+-ghead -h &> /dev/null || [ $? -eq 127 ] && HEAD="head"
+-
++command -v gdate > /dev/null && DATE="gdate" || DATE="date"
++command -v gsed > /dev/null && SED="gsed" || SED="sed"
++command -v ggrep > /dev/null && GREP="ggrep" || GREP="grep"
++command -v ghead > /dev/null && HEAD="ghead" || HEAD="head"
++command -v dotlockfile > /dev/null && LOCKMETHOD="dotlockfile" || LOCKMETHOD="mkdir"
+
+ # Validating
+ [ -n "$SSHCMD" ] || syntaxerror "Invalid SSH command: $SSHCMD"
+@@ -244,23 +240,17 @@ fi
+
+ LOCKFILE="${MOUNTPOINT}/${HOST}/.lock"
+
+-if dotlockfile -r 0 -l -p "${LOCKFILE}"; then
+- LOCKMETHOD="dotlockfile"
++if [ x"$LOCKMETHOD" = x"dotlockfile" ] && ${LOCKMETHOD} -r 0 -l -p "${LOCKFILE}" ; then
+ logit "Lock obtained at ${LOCKFILE} with dotlockfile"
+ trap "ECODE=$?; dotlockfile -u \"${LOCKFILE}\"; exit $ECODE" EXIT INT TERM
+-else
+- RETVAL="$?"
+- if [ "$RETVAL" = "127" ]; then
+- LOCKMETHOD="mkdir"
+- mkdir "${LOCKFILE}" || exiterror "Could not obtain lock at ${LOCKFILE}; if $0 is not already running, rmdir that path."
++elif [ x"$LOCKMETHOD" = x"mkdir" ]; then
++ ${LOCKMETHOD} "${LOCKFILE}" || exiterror "Could not obtain lock at ${LOCKFILE}; if $0 is not already running, rmdir that path."
+ logit "Lock obtained at ${LOCKFILE} with mkdir"
+ trap "ECODE=$?; rmdir \"${LOCKFILE}\"" EXIT INT TERM
+- else
++else
+ exiterror "Could not obtain lock at ${LOCKFILE}; $0 likely already running."
+- fi
+ fi
+
+-
+ reap () {
+ DATASET="$1"
+ # We always save the most recent.
+--
+2.17.1
+