From 49a1622ad8b9545c043a5a6ba7c46ea37b95b0f0 Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Sat, 24 Feb 2024 19:58:49 +0100
Subject: fix(hm/conf/lf/cmds): Better manage files with pre-defined extensions
---
hm/soispha/conf/lf/commands/scripts/archive.sh | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
(limited to 'hm/soispha/conf/lf/commands/scripts/archive.sh')
diff --git a/hm/soispha/conf/lf/commands/scripts/archive.sh b/hm/soispha/conf/lf/commands/scripts/archive.sh
index 27947d6f..e437dad2 100755
--- a/hm/soispha/conf/lf/commands/scripts/archive.sh
+++ b/hm/soispha/conf/lf/commands/scripts/archive.sh
@@ -36,9 +36,10 @@ esac
prompt "Archive name: "
name=""
-while [ -z "$name" ] || [ -e "$name.$ext" ]; do
- read -r name
- if [ -e "$name.$ext" ]; then
+while [ -z "$name" ] || [ -e "$name" ]; do
+ read -r name_base
+ name="$name_base.$ext"
+ if [ -e "$name" ]; then
prompt "Archive already exists, overwrite [y|N]: "
read -r ans
@@ -60,17 +61,17 @@ done <"$(tmp echo "$fx")"
case "$archiver" in
"gzip")
- tar --create --gzip -file="$name".tar.gz "$@"
+ tar --create --gzip -file="$name" "$@"
;;
"xz")
- tar --create --file="$name".tar "$@"
- xz --compress -9 --extreme --threads=0 "$name".tar
+ tar --create --file="$name" "$@"
+ xz --compress -9 --extreme --threads=0 "$name"
;;
"7z")
- 7z a "$name".7z "$@"
+ 7z a "$name" "$@"
;;
"zip")
- zip --symlinks -9 -r "$name".zip "$@"
+ zip --symlinks -9 -r "$name" "$@"
;;
esac
# vim: ft=sh
--
cgit 1.4.1