From 7f06b56775575c5c678bab2a1a99c8c4d0a8e662 Mon Sep 17 00:00:00 2001 From: Chris Down Date: Sun, 22 Apr 2018 10:17:49 +0100 Subject: [PATCH 1/2] clipdel: Give more helpful message if we didn't provide a pattern --- clipdel | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/clipdel b/clipdel index ebdc51b..ea4e19c 100755 --- a/clipdel +++ b/clipdel @@ -44,6 +44,11 @@ fi raw_pattern=${@: -1} esc_pattern=${raw_pattern/\#/'\#'} +if ! [[ $raw_pattern ]]; then + printf '%s\n' 'No pattern provided, see --help' >&2 + exit 2 +fi + exec {lock_fd}> "$lock_file" if (( CM_REAL_DELETE )) && [[ "$raw_pattern" == ".*" ]]; then From a77c2731ba86ac5370b1acadcad2a823ded47047 Mon Sep 17 00:00:00 2001 From: Chris Down Date: Sun, 22 Apr 2018 10:19:03 +0100 Subject: [PATCH 2/2] clipdel: Don't take "-d" as the pattern if only "-d" was passed --- clipdel | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/clipdel b/clipdel index ea4e19c..d3ca5cd 100755 --- a/clipdel +++ b/clipdel @@ -2,7 +2,10 @@ : "${CM_DIR="${XDG_RUNTIME_DIR-"${TMPDIR-/tmp}"}"}" CM_REAL_DELETE=0 -[[ $1 == -d ]] && CM_REAL_DELETE=1 +if [[ $1 == -d ]]; then + CM_REAL_DELETE=1 + shift +fi major_version=5 @@ -41,7 +44,7 @@ fi # https://github.com/koalaman/shellcheck/issues/1141 # shellcheck disable=SC2124 -raw_pattern=${@: -1} +raw_pattern=$1 esc_pattern=${raw_pattern/\#/'\#'} if ! [[ $raw_pattern ]]; then