From 728d242d3c196a3fb2ed99c388581eab8edf3b6e Mon Sep 17 00:00:00 2001
From: Chris Down <chris@chrisdown.name>
Date: Mon, 19 Feb 2018 15:41:11 +0000
Subject: [PATCH] Remove CM_ONESHOT-specific logic in flock failure checks

Now that we're in a subshell and acting asynchronously, this doesn't do
anything different.
---
 clipmenud | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/clipmenud b/clipmenud
index 1a0b779..473e5e1 100755
--- a/clipmenud
+++ b/clipmenud
@@ -125,14 +125,8 @@ while true; do
 
     {
     if ! flock -x -w "$lock_timeout" "$lock_fd"; then
-        if (( CM_ONESHOT )); then
-            printf 'ERROR: %s\n' 'Timed out waiting for lock' >&2
-            exit 1
-        else
-            printf 'ERROR: %s\n' \
-                'Timed out waiting for lock, skipping this run' >&2
-            continue
-        fi
+        printf 'ERROR: %s\n' 'Timed out waiting for lock' >&2
+        exit 1
     fi
 
     for selection in clipboard primary; do