From e75b95abac3c5adb25b2a61c0902f8b7e2c4eb7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christer=20War=C3=A9n?= <cwchristerw@gmail.com>
Date: Mon, 23 Jun 2025 09:36:34 +0300
Subject: [PATCH] Code Update

---
 init.sh                | 12 +++++++++++-
 src/functions/login.sh |  2 +-
 src/functions/start.sh | 10 ++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/init.sh b/init.sh
index 1a10e8c..db061d9 100755
--- a/init.sh
+++ b/init.sh
@@ -136,7 +136,7 @@ wx-login(){
     elif [[ $(hostname -d) = *"devices.christerwaren.fi" ]]
     then
         ORG=cwchristerw
-    elif [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .org) ]]
+    elif [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .org) != "null" ]]
     then
         ORG=$(cat $HOME/.warengroup/config.json | jq -r .org)
     else
@@ -302,6 +302,16 @@ wi-restricted(){
 
 wi-start(){
     wi-header "Warén Init" h1
+
+    mkdir -p $HOME/.warengroup &> /dev/null
+
+    if [[ ! -f "$HOME/.warengroup/config.json" || $(cat $HOME/.warengroup/config.json | jq -e . >/dev/null 2>&1 | echo ${PIPESTATUS[1]}) -gt 0 ]]
+    then
+        echo '{}' | jq > $HOME/.warengroup/config.json
+    fi
+
+    mkdir -p $HOME/.ssh/keys
+    chmod 700 -R $HOME/.ssh/keys
 }
 
 wi-stop (){
diff --git a/src/functions/login.sh b/src/functions/login.sh
index 7940996..ca3a891 100644
--- a/src/functions/login.sh
+++ b/src/functions/login.sh
@@ -13,7 +13,7 @@ wx-login(){
     elif [[ $(hostname -d) = *"devices.christerwaren.fi" ]]
     then
         ORG=cwchristerw
-    elif [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .org) ]]
+    elif [[ $USER != "root" && $USER != "local" && -f "$HOME/.warengroup/config.json" && $(cat $HOME/.warengroup/config.json | jq -r .org) != "null" ]]
     then
         ORG=$(cat $HOME/.warengroup/config.json | jq -r .org)
     else
diff --git a/src/functions/start.sh b/src/functions/start.sh
index 8c90b76..7010e07 100644
--- a/src/functions/start.sh
+++ b/src/functions/start.sh
@@ -1,3 +1,13 @@
 wi-start(){
     wi-header "Warén Init" h1
+
+    mkdir -p $HOME/.warengroup &> /dev/null
+
+    if [[ ! -f "$HOME/.warengroup/config.json" || $(cat $HOME/.warengroup/config.json | jq -e . >/dev/null 2>&1 | echo ${PIPESTATUS[1]}) -gt 0 ]]
+    then
+        echo '{}' | jq > $HOME/.warengroup/config.json
+    fi
+
+    mkdir -p $HOME/.ssh/keys
+    chmod 700 -R $HOME/.ssh/keys
 }