bin/: Cleanup temp file before exit

7 files changed, 13 insertions, 5 deletions

diff --git a/bin/archiveit b/bin/archiveit
index da132d7..a7b5a08 100755
--- a/bin/archiveit
+++ b/bin/archiveit
@@ -90,6 +90,7 @@ QUERY="$(
 
 # Copy the database because it is locked.
 DB="$(mkstemp)"
+trap 'rm -f "$DB"' EXIT
 cp ~/.mozilla/firefox/*.default/places.sqlite "$DB"
 
 cd ~/Documents/Archive/
diff --git a/bin/bins b/bin/bins
index 9f869de..494f4f0 100755
--- a/bin/bins
+++ b/bin/bins
@@ -76,7 +76,7 @@ IFS=:
 # shellcheck disable=2086
 if stest -rdq -n "$F" $PATH; then
 	T="$(mkstemp)"
-	trap 'rm -f $T' EXIT
+	trap 'rm -f "$T"' EXIT
 	stest -lxf $PATH | sort -u > "$T"
 	mv "$T" "$F"
 fi
diff --git a/bin/cl b/bin/cl
index 285136e..dd690bb 100755
--- a/bin/cl
+++ b/bin/cl
@@ -118,8 +118,10 @@ for flag in "$@"; do
 	esac
 done
 
-NO_RC=false
 SCRIPT="$(mkstemp)"
+trap 'rm -f "$SCRIPT"' EXIT
+
+NO_RC=false
 LISP_CLI_RC="${XDG_CONFIG_HOME:-$HOME/.config}/lisp-cli/init.lisp"
 VERBOSE=false
 IMAGE=''
@@ -188,6 +190,7 @@ if [ "$PRESERVE_ARGS" = false ]; then
 fi
 
 MAIN="$(mkstemp)"
+trap 'rm -f "$MAIN"' EXIT
 if [ "$NO_RC" = false ] && [ -e "$LISP_CLI_RC" ]; then
 	escape_name "$LISP_CLI_RC" > "$MAIN"
 fi
@@ -245,7 +248,7 @@ case "$IMPL" in
 		else
 			set -x
 		fi
-		exec clisp "$@"
+		clisp "$@"
 		;;
 	clozure)
 		set -- -l "$MAIN" "$@"
@@ -260,7 +263,7 @@ case "$IMPL" in
 		else
 			set -x
 		fi
-		exec ccl "$@"
+		ccl "$@"
 		;;
 	cmucl)
 		exit 4
@@ -289,7 +292,7 @@ case "$IMPL" in
 		else
 			set -x
 		fi
-		exec sbcl "$@"
+		sbcl "$@"
 		;;
 	*)
 		printf 'Unsupported implementation: "%s".\n\n' "$IMPL" >&2
diff --git a/bin/e b/bin/e
index d0b261a..b2778e1 100755
--- a/bin/e
+++ b/bin/e
@@ -71,6 +71,7 @@ fi
 
 if [ ! -t 0 ]; then
 	F="$(mkstemp)"
+	trap 'rm -f "$F"' EXIT
 	cat > "$F"
 	exec 0</dev/tty
 	exec 3>&1
diff --git a/bin/print b/bin/print
index c1c6b2e..4911ecd 100755
--- a/bin/print
+++ b/bin/print
@@ -131,6 +131,7 @@ done
 shift $((OPTIND - 1))
 
 NEWDIR="$(mkdtemp)"
+trap 'rm -rf "$NEWDIR"' EXIT
 if [ -z "${1:-}" ]; then
 	FILE="$NEWDIR"/STDIN
 	cat - > "$FILE"
diff --git a/bin/with-email b/bin/with-email
index bd3ef96..02789e9 100755
--- a/bin/with-email
+++ b/bin/with-email
@@ -76,6 +76,7 @@ now() {
 }
 
 OUT="$(mkstemp)"
+trap 'rm -f "$OUT"' EXIT
 {
 	printf 'Running command: %s\n' "$*"
 	printf 'Starting at: %s\n' "$(now)"
diff --git a/bin/yt b/bin/yt
index 9aed64f..aa39fd1 100755
--- a/bin/yt
+++ b/bin/yt
@@ -87,6 +87,7 @@ fi
 
 if [ ! -e "$1" ]; then
 	F="$(mkstemp)"
+	trap 'rm -f "$F"' EXIT
 	printf '%s\n' "$1" > "$F"
 else
 	F="$1"