2 files changed, 14 insertions, 12 deletions
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
diff --git a/hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh b/hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh
index 6ceed95e..bc57563c 100755
--- a/hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh
+++ b/hm/soispha/conf/lf/commands/scripts/mk_scr_default.sh
@@ -14,9 +14,10 @@ id="$id"
 
 prompt "Script name: "
 name=""
-while [ -z "$name" ] || [ -e "$name.sh" ]; do
-    read -r name
-    if [ -e "$name.sh" ]; then
+while [ -z "$name" ] || [ -e "$name" ]; do
+    read -r name_base
+    name="$name_base.sh"
+    if [ -e "$name" ]; then
         prompt "Script already exists, overwrite [y|N]: "
         read -r ans
 
@@ -30,7 +31,7 @@ done
 
 script="$(pwd)"/"$name"
 
-cat "%SHELL_LIBRARY_TEMPLATE" >"$script.sh"
+cat "%SHELL_LIBRARY_TEMPLATE" >"$script"
 chmod +x "$script"
 "$VISUAL" "$script"