From 61f866c255af93e27e9ccd6aaa9ad98843608e4a Mon Sep 17 00:00:00 2001
From: Dmitry Badovsky <dbadovsky@gmail.com>
Date: Sun, 26 Oct 2025 16:57:57 +0000
Subject: [PATCH] Update vmcreate1.sh

---
 vmcreate1.sh | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/vmcreate1.sh b/vmcreate1.sh
index ed980c9..d519570 100644
--- a/vmcreate1.sh
+++ b/vmcreate1.sh
@@ -149,8 +149,8 @@ if [[ $# -ne 0 && -v "$file" ]]; then
 fi
 
 # Проверка файла на соответствие шаблону IPv4 адреса и hostname, создаём временный файл из валидных строк
-echo "DEBUG file: $file"
 if [[ $# -eq 0 && -e "$file" ]]; then
+    echo "DEBUG file: $file"
     touch hosts.tmp
     echo -n "" > hosts.tmp
     echo "DEBUG"
@@ -178,6 +178,7 @@ fi
 
 # Если заданы аргументы, то создаем временный файл 
 if [[ $# -ne 0 ]]; then
+    echo "DEBUG using arguments"
     touch hosts.tmp
     echo -n "" > hosts.tmp
     for arg in "$@"; do
@@ -196,22 +197,17 @@ if [[ $# -ne 0 ]]; then
 fi
 
 # Проверяем ключ
-if [ -v $pubkey ]; then
-    if [[ ! -e "$pubkey" ]]; then 
-        input=y
-        echo "Public key does not exist. Generate new pair? y/n"
-        read input
-        case $input in
-            y) read -p "Enter name for your PRIVATE key: " privkey && keypair_generate "$privkey";;
-            Y) read -p "Enter name for your PRIVATE key: " privkey && keypair_generate "$privkey";;
-            n) echo "Public key is necessary to continue. Please specify or generate new pair."; exit 6;;
-            N) echo "Public key is necessary to continue. Please specify or generate new pair."; exit 6;;
-            *) echo "Use '-h' flag for help"; exit 6;;
-        esac
-    fi
-    else
-    pubkey="key.pub"
-    if [[ ! -e key.pub ]]; then echo "key.pub does not exist. Please use '-k' flag to specify public key."; exit 7; fi
+if [[ ! -e "$pubkey" ]]; then 
+    input=y
+    echo "Public key does not exist. Generate new pair? y/n"
+    read input
+    case $input in
+        y) read -p "Enter name for your PRIVATE key: " privkey && keypair_generate "$privkey";;
+        Y) read -p "Enter name for your PRIVATE key: " privkey && keypair_generate "$privkey";;
+        n) echo "Public key is necessary to continue. Please specify or generate new pair."; exit 6;;
+        N) echo "Public key is necessary to continue. Please specify or generate new pair."; exit 6;;
+        *) echo "Use '-h' flag for help"; exit 6;;
+    esac
 fi
 
 ###DEBUG 1