From 8fb2cf7488008e8f38266819b3885532b3fba799 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20=C5=A0tefka?= <jiri.stefka@atlas.cz>
Date: Thu, 2 Mar 2023 21:31:28 +0100
Subject: [PATCH] Fix version and server type failsafe triggering on server
 install

---
 .msman/fabric.sh  | 1 +
 .msman/paper.sh   | 3 +++
 .msman/version.sh | 2 +-
 msman.sh          | 8 +++++---
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.msman/fabric.sh b/.msman/fabric.sh
index 0900918..81a965f 100644
--- a/.msman/fabric.sh
+++ b/.msman/fabric.sh
@@ -36,6 +36,7 @@ function check_updates {
     download_build=$latest_build
     update_version=true
     update_build=true
+    return
   else
     echo Checking for updates...
   fi
diff --git a/.msman/paper.sh b/.msman/paper.sh
index 3ff6e47..829929e 100644
--- a/.msman/paper.sh
+++ b/.msman/paper.sh
@@ -37,6 +37,9 @@ function check_updates {
     download_build=$latest_build
     update_version=true
     update_build=true
+    return
+  else
+    echo Checking for updates...
   fi
 
   # Check if $build is empty
diff --git a/.msman/version.sh b/.msman/version.sh
index 3cec9c3..5c9ccf9 100644
--- a/.msman/version.sh
+++ b/.msman/version.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-EXTRA_SCRIPTS_VERSION="v2.1.1"
+EXTRA_SCRIPTS_VERSION="v2.1.2"
diff --git a/msman.sh b/msman.sh
index ef4a026..4e142b5 100755
--- a/msman.sh
+++ b/msman.sh
@@ -8,7 +8,7 @@ set -e
 #                            and acknowledge the original script and author.                                #
 #############################################################################################################
 
-CURRENT_SCRIPT_VERSION="v2.1.1"
+CURRENT_SCRIPT_VERSION="v2.1.2"
 
 # --------------------------------------------------
 # You shouldn't need to change anything in this file
@@ -477,8 +477,10 @@ function main {
   get_existing_server
 
   # Check if the server type differs from the one in the config
-  if [[ $existing_server_type != $server_type ]]; then
-    ask_server_differs
+  if [[ $server_file != false ]]; then
+    if [[ $existing_server_type != $server_type ]]; then
+      ask_server_differs
+    fi
   fi
 
   # Check if the version and build are valid