aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Hill <bruce@bruce-hill.com>2019-11-04 15:28:00 +0100
committerBruce Hill <bruce@bruce-hill.com>2019-11-04 15:28:00 +0100
commit43432516292fb183d79b2b3e388eee4770b99eb9 (patch)
tree57c965949c797c73266e8d7edd344ed6642c49c7
parent1f4122d8d5a7a08029329e80143cb06a16298881 (diff)
Removed `spin` because the "eval" part of it was broken and it adds
unnecessary complexity.
-rw-r--r--bb.h18
-rw-r--r--bindings.bb6
2 files changed, 4 insertions, 20 deletions
diff --git a/bb.h b/bb.h
index 0839066..34da658 100644
--- a/bb.h
+++ b/bb.h
@@ -25,7 +25,7 @@
#include "bterm.h"
// Macros:
-#define BB_VERSION "0.18.0"
+#define BB_VERSION "0.19.0"
#ifndef PATH_MAX
#define PATH_MAX 4096
@@ -308,22 +308,6 @@ PICK ";\n"
" grep -i -m1 \"$(echo \"$query\" | sed 's;.;[^/&]*[&];g')\";\n"
#endif
"}\n"
-"spin() {\n"
-#ifdef SPIN
-SPIN ";\n"
-#else
-" eval \"$@\" &\n"
-" pid=$!;\n"
-" spinner='-\\|/';\n"
-" sleep 0.01;\n"
-" while kill -0 $pid 2>/dev/null; do\n"
-" printf '%c\\033[D' \"$spinner\" >/dev/tty;\n"
-" spinner=\"$(echo $spinner | sed 's/\\(.\\)\\(.*\\)/\\2\\1/')\";\n"
-" sleep 0.1;\n"
-" done;\n"
-" wait $pid;\n"
-#endif
-"}\n"
#ifdef SH
"alias sh=" SH";\n"
#else
diff --git a/bindings.bb b/bindings.bb
index ee0cbaf..54040e4 100644
--- a/bindings.bb
+++ b/bindings.bb
@@ -115,7 +115,7 @@ D: # Delete all selected files
confirm && rm -rf "$@" && bb +deselect +refresh
Ctrl-v: # Move files here
printf "\033[1mMoving the following to here:\n \033[33m$(printf ' %s\n' "$@")\033[0m" | more &&
- confirm && spin mv -i "$@" . && bb +deselect +refresh &&
+ confirm && mv -i "$@" . && bb +deselect +refresh &&
for f; do bb +sel:"$(basename "$f")"; done ||
pause
c: # Copy a file
@@ -124,8 +124,8 @@ C: # Copy all selected files here
[ $# -gt 0 ] && printf "\033[1mCopying the following to here:\n \033[33m$(printf ' %s\n' "$@")\033[0m" | more &&
confirm &&
for f; do if [ "./$(basename "$f")" -ef "$f" ]; then
- spin cp -ri "$f" "$f.copy";
- else spin cp -ri "$f" .; fi; done; bb +refresh
+ cp -ri "$f" "$f.copy" || break;
+ else cp -ri "$f" . || break; fi; done; bb +refresh
Ctrl-n: # New file/directory
case "$(printf '%s\0' File Directory | pick "Create new: ")" in
File)