warengroup/init.sh
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move Hostname variable to init function

Browse Source
This commit is contained in:
Christer Warén
2025-06-21 23:48:10 +03:00
parent 2220092a87
commit 196a4ef2eb
3 changed files with 24 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
init.sh
View File

@ -65,9 +65,20 @@ wx-header(){
} }
wi-init(){ wi-init(){
wi-login $1 $2 wi-login $1
wi-header "Init" 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 mkdir -p ~/.ssh/keys &> /dev/null
apt-get update &> /dev/null apt-get update &> /dev/null
@ -111,13 +122,6 @@ wi-init(){
} }
wx-login(){ wx-login(){
if [[ -z "$HOSTNAME" || ${#HOSTNAME} -lt 5 ]]
then
wx-header "Login"
echo "Status: Hostname Required"
wx-stop
fi
if [[ ! -z $1 ]] if [[ ! -z $1 ]]
then then
ORG=$1 ORG=$1
@ -156,18 +160,6 @@ wx-login(){
IDM_DOMAIN="idm.waren.io" IDM_DOMAIN="idm.waren.io"
VAULT_DOMAIN="vault.cwinfo.net" 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" ]] if [[ -z $USER || $USER == "root" || $USER == "local" ]]
then then
if [[ -z $SUDO_USER ]] if [[ -z $SUDO_USER ]]

13
src/functions/init.sh
View File

@ -1,7 +1,18 @@
wi-init(){ wi-init(){
wi-login $1 $2 wi-login $1
wi-header "Init" 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 mkdir -p ~/.ssh/keys &> /dev/null
apt-get update &> /dev/null apt-get update &> /dev/null

19
src/functions/login.sh
View File

@ -1,11 +1,4 @@
wx-login(){ wx-login(){
if [[ -z "$HOSTNAME" || ${#HOSTNAME} -lt 5 ]]
then
wx-header "Login"
echo "Status: Hostname Required"
wx-stop
fi
if [[ ! -z $1 ]] if [[ ! -z $1 ]]
then then
ORG=$1 ORG=$1
@ -44,18 +37,6 @@ wx-login(){
IDM_DOMAIN="idm.waren.io" IDM_DOMAIN="idm.waren.io"
VAULT_DOMAIN="vault.cwinfo.net" 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" ]] if [[ -z $USER || $USER == "root" || $USER == "local" ]]
then then
if [[ -z $SUDO_USER ]] if [[ -z $SUDO_USER ]]