From f363327a34caa6d4badba09fd99cd609b4ce3b68 Mon Sep 17 00:00:00 2001
From: sometimesuseful <>
Date: Tue, 12 Nov 2024 15:14:02 +0000
Subject: [PATCH] removed check_dependencies in favor of functions.sh version,
 modified cleanup to use new log function, fixed trap signals

---
 modules/archive.sh | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)
 mode change 100755 => 100644 modules/archive.sh

diff --git a/modules/archive.sh b/modules/archive.sh
old mode 100755
new mode 100644
index a1d52f7..2c0bf23
--- a/modules/archive.sh
+++ b/modules/archive.sh
@@ -4,21 +4,12 @@
 source colors.sh
 source functions.sh
 
-trap 'cleanup' EXIT
+trap 'cleanup' ERR INT
 
 cleanup() {
-	[[ -n "$archive" ]] && rm -f "$archive*"
-
-	echo "Cleaned up all $archive files" >&2
-}
-
-check_dependencies() {
-	if ! mkdir -p "$archive_dir"; then
-		echo "ERROR: Unable to create archive directory"
-		exit 1
-	elif ! command -v 7z 2>&1 >/dev/null; then
-		echo "ERROR: 7z must be installed"
-		exit 1
+	if [[ -n "$archive" ]]; then
+		rm -f "${archive}"*
+		log "INFO" "Cleaning up $(basename $archive) remains before exit"
 	fi
 }
 
@@ -76,7 +67,13 @@ main() {
 	archive_pwd="${2}"
 	size="$3"
 
-	check_dependencies
+	check_dependencies "7z"
+
+	if ! mkdir -p "$archive_dir"; then
+		log "ERROR" "Unable to create archive directory"
+		exit 1
+	fi
+
 	check_input
 	set_volumes
 	generate_name
@@ -89,6 +86,6 @@ main() {
 if (( $# == 3 )); then
 	main "$@"
 else
-	log_err "Missing arguments"
+	log "ERROR" "Missing arguments"
 	exit 2
 fi