refactor cutbuffer to single file

4 files changed, 36 insertions, 35 deletions

diff --git a/dot/local/bin/cutbuffer b/dot/local/bin/cutbuffer
new file mode 100644
index 0000000..423d974
--- /dev/null
+++ b/dot/local/bin/cutbuffer
@@ -0,0 +1,34 @@
+#!/bin/sh
+dest_basename=cutbuffer_grab
+dest_extension=txt
+date_format=+%F_%H%M%S
+
+destdir=$HOME/$dest_basename
+
+cutbuffer_push()
+{
+    now=$(date "$date_format")
+    dest=$dest_basename.$now.$dest_extension
+    xcb -p 0 > "$dest"
+}
+
+cutbuffer_pop()
+{
+    nameglob=$dest_basename.*.$dest_extension
+    f=$(find . -maxdepth 1 -type f  -name "$nameglob" -print0 | sort -z -V -r | head -z -n 1 | xargs -0)
+
+    xcb -s 0 < "$f"
+    xsel --input < "$f"
+
+    mkdir -p .popped
+    mv "$f" -t .popped
+}
+
+set -e
+mkdir -p "$destdir"
+cd "$destdir"
+case "$*" in
+    pop) cutbuffer_pop ;;
+    push) cutbuffer_push ;;
+esac
+
diff --git a/dot/local/bin/cutbuffer_pop b/dot/local/bin/cutbuffer_pop
deleted file mode 100755
index e994342..0000000
--- a/dot/local/bin/cutbuffer_pop
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-dest_basename=cutbuffer_grab
-dest_extension=txt
-destdir=$HOME/$dest_basename
-
-set -e
-mkdir -p "$destdir"
-cd "$destdir"
-
-nameglob=$dest_basename.*.$dest_extension
-f=$(find . -maxdepth 1 -type f  -name "$nameglob" -print0 | sort -z -V -r | head -z -n 1 | xargs -0)
-
-xcb -s 0 < "$f"
-xsel --input < "$f"
-
-mkdir -p .popped
-mv "$f" -t .popped
-
diff --git a/dot/local/bin/cutbuffer_push b/dot/local/bin/cutbuffer_push
deleted file mode 100755
index ab3ca98..0000000
--- a/dot/local/bin/cutbuffer_push
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-dest_basename=cutbuffer_grab
-dest_extension=txt
-date_format=+%F_%H%M%S
-
-destdir=$HOME/$dest_basename
-
-set -e
-
-mkdir -p "$destdir"
-cd "$destdir"
-now=$(date "$date_format")
-dest=$dest_basename.$now.$dest_extension
-xcb -p 0 > "$dest"
-
diff --git a/dot/xbindkeysrc b/dot/xbindkeysrc
index ec4eb9d..62bc5d7 100644
--- a/dot/xbindkeysrc
+++ b/dot/xbindkeysrc
@@ -78,10 +78,10 @@ control + XF86AudioLowerVolume
 "im"
   Print
 
-"cutbuffer_push"
+"cutbuffer push"
   control + Print
 
-"cutbuffer_pop"
+"cutbuffer pop"
   alt + Print
 
 "scrolltoggle"