stuffz

cbz/cbzcat

@@ -12,8 +12,9 @@ test -n "$2" \
 
 set -x
 
-d="$(mktemp -d)"
-mkdir "$d"/x
+d="$(mktemp -d || printf '%s/.cbzcat' "$HOME/")"
+trap 'rm -rf "$d"; trap - EXIT; exit' EXIT INT HUP
+mkdir -p "$d"/x
 
 i=1  # index
 il=1 # index length in digits
@@ -26,15 +27,6 @@ for f in "$@"; do
 	rm "$d"/x/*.xml
 
 	for g in "$d"/x/*; do
-		# move file to indexed position
-		printf '%s\n' "$g" \
-			| sed 's|^.*\.||' \
-			| xargs printf '%s/%s%s\n' "$d" "$i". \
-			| xargs mv "$g"
-
-		# increment i
-		i="$(printf '1 + %s\n' "$i" | bc)"
-
 		# if there aren't enough leading zeroes
 		if ! printf '%s' "$i" \
 				| wc -c \
@@ -48,6 +40,15 @@ for f in "$@"; do
 			# update index digit length
 			il="$(printf '1 + %s\n' "$il" | bc)"
 		fi
+
+		# move file to indexed position
+		printf '%s\n' "$g" \
+			| sed 's|^.*\.||' \
+			| xargs printf '%s/%s%s\n' "$d" "$i". \
+			| xargs mv "$g"
+
+		# increment i
+		i="$(printf '1 + %s\n' "$i" | bc)"
 	done
 done