From 196a4ef2eba0c624c8b7d6bde7950bf2a0a0f611 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christer=20War=C3=A9n?= <cwchristerw@gmail.com>
Date: Sat, 21 Jun 2025 23:48:10 +0300
Subject: [PATCH] Move Hostname variable to init function

---
 init.sh                | 32 ++++++++++++--------------------
 src/functions/init.sh  | 13 ++++++++++++-
 src/functions/login.sh | 19 -------------------
 3 files changed, 24 insertions(+), 40 deletions(-)

diff --git a/init.sh b/init.sh
index 668ce87..84a12aa 100755
--- a/init.sh
+++ b/init.sh
@@ -65,9 +65,20 @@ wx-header(){
 }
 
 wi-init(){
-    wi-login $1 $2
+    wi-login $1
     wi-header "Init"
 
+    if [[ ! -z $2 && ${#$2} -gt 5 ]]
+    then
+        HOSTNAME="$2.$DEVICE_DOMAIN"
+    elif [[ $(hostname -d) ]]
+    then
+        HOSTNAME=$(hostname --fqdn)
+    else
+        echo "Status: Hostname Required"
+        wx-stop
+    fi
+
     mkdir -p ~/.ssh/keys &> /dev/null
 
     apt-get update &> /dev/null
@@ -111,13 +122,6 @@ wi-init(){
 }
 
 wx-login(){
-    if [[ -z "$HOSTNAME" || ${#HOSTNAME} -lt 5 ]]
-    then
-        wx-header "Login"
-        echo "Status: Hostname Required"
-        wx-stop
-    fi
-
     if [[ ! -z $1 ]]
     then
         ORG=$1
@@ -156,18 +160,6 @@ wx-login(){
     IDM_DOMAIN="idm.waren.io"
     VAULT_DOMAIN="vault.cwinfo.net"
 
-    if [[ ! -z $2 ]]
-    then
-        HOSTNAME="$2.$DEVICE_DOMAIN"
-    elif [[ $(hostname -d) ]]
-    then
-        HOSTNAME=$(hostname --fqdn)
-    else
-        wx-header "Login"
-        echo "Status: Hostname Required"
-        wx-stop
-    fi
-
     if [[ -z $USER || $USER == "root" || $USER == "local" ]]
     then
         if [[ -z $SUDO_USER ]]
diff --git a/src/functions/init.sh b/src/functions/init.sh
index 394ddda..94d62f3 100644
--- a/src/functions/init.sh
+++ b/src/functions/init.sh
@@ -1,7 +1,18 @@
 wi-init(){
-    wi-login $1 $2
+    wi-login $1
     wi-header "Init"
 
+    if [[ ! -z $2 && ${#$2} -gt 5 ]]
+    then
+        HOSTNAME="$2.$DEVICE_DOMAIN"
+    elif [[ $(hostname -d) ]]
+    then
+        HOSTNAME=$(hostname --fqdn)
+    else
+        echo "Status: Hostname Required"
+        wx-stop
+    fi
+
     mkdir -p ~/.ssh/keys &> /dev/null
 
     apt-get update &> /dev/null
diff --git a/src/functions/login.sh b/src/functions/login.sh
index cb044be..b631469 100644
--- a/src/functions/login.sh
+++ b/src/functions/login.sh
@@ -1,11 +1,4 @@
 wx-login(){
-    if [[ -z "$HOSTNAME" || ${#HOSTNAME} -lt 5 ]]
-    then
-        wx-header "Login"
-        echo "Status: Hostname Required"
-        wx-stop
-    fi
-
     if [[ ! -z $1 ]]
     then
         ORG=$1
@@ -44,18 +37,6 @@ wx-login(){
     IDM_DOMAIN="idm.waren.io"
     VAULT_DOMAIN="vault.cwinfo.net"
 
-    if [[ ! -z $2 ]]
-    then
-        HOSTNAME="$2.$DEVICE_DOMAIN"
-    elif [[ $(hostname -d) ]]
-    then
-        HOSTNAME=$(hostname --fqdn)
-    else
-        wx-header "Login"
-        echo "Status: Hostname Required"
-        wx-stop
-    fi
-
     if [[ -z $USER || $USER == "root" || $USER == "local" ]]
     then
         if [[ -z $SUDO_USER ]]