cutbuffer final cleanup

2 files changed, 8 insertions, 9 deletions

diff --git a/dot/local/bin/cutbuffer_pop b/dot/local/bin/cutbuffer_pop
index d8ae2ba..d723a27 100755
--- a/dot/local/bin/cutbuffer_pop
+++ b/dot/local/bin/cutbuffer_pop
@@ -1,7 +1,7 @@
 #!/bin/sh
-default_basename=cutbuffer_grab
-default_extension=txt
-destdir=$HOME/$default_basename
+dest_basename=cutbuffer_grab
+dest_extension=txt
+destdir=$HOME/$dest_basename
 
 chdir_to_destination()
 {
@@ -18,7 +18,7 @@ set -e
 
 chdir_to_destination
 
-f=$(find . -maxdepth 1 -type f -name 'cutbuffer_grab.*.txt' -printf "%C@ %h/%f\0" | extract)
+f=$(find . -maxdepth 1 -type f -name "$dest_basename.*.$dest_extension" -printf "%C@ %h/%f\0" | extract)
 
 xcb -s 0 < "$f"
 xsel --input < "$f"
diff --git a/dot/local/bin/cutbuffer_push b/dot/local/bin/cutbuffer_push
index 62faf7b..cad9367 100755
--- a/dot/local/bin/cutbuffer_push
+++ b/dot/local/bin/cutbuffer_push
@@ -1,9 +1,9 @@
 #!/bin/sh
-default_basename=cutbuffer_grab
-default_extension=txt
+dest_basename=cutbuffer_grab
+dest_extension=txt
 date_format=+%F_%H%M%S
 
-destdir=$HOME/$default_basename
+destdir=$HOME/$dest_basename
 
 chdir_to_destination()
 {
@@ -13,9 +13,8 @@ chdir_to_destination()
 
 choose_destination()
 {
-        local stamp basename extension now
         now=$(date "$date_format")
-        DESTINATION=$default_basename.$now.$default_extension
+        DESTINATION=$dest_basename.$now.$dest_extension
 }
 
 set -e