From 57a43a136d5a8c09e1fde393d75a3d66d6008482 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 23 Oct 2023 09:37:55 +0200
Subject: [SSPS] bashrc: No more ifconfig; fix prompt char #/$

---
 satellit_installer/static_files/system/opt/openslx/bashrc.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'satellit_installer')

diff --git a/satellit_installer/static_files/system/opt/openslx/bashrc.inc b/satellit_installer/static_files/system/opt/openslx/bashrc.inc
index 98711d4..6e8689e 100644
--- a/satellit_installer/static_files/system/opt/openslx/bashrc.inc
+++ b/satellit_installer/static_files/system/opt/openslx/bashrc.inc
@@ -1,13 +1,15 @@
-ifname="$( ifconfig | grep -oEm1 '^e\w+' )"
-slxip="$( ip -4 a show "$ifname" 2>/dev/null | grep -m1 '^\s*inet ' | awk '{print $2}' )"
+slxif="$( ip a s 2> /dev/null | grep -oPm1 '(?<=^[0-9]: )e[^:]+' )"
+slxip="$( ip -4 a s "$slxif" 2> /dev/null | grep -m1 '^\s*inet ' | awk '{print $2}' )"
 [ -z "$slxip" ] && slxip="$( ip -4 a | grep '^\s*inet '| grep -vFm1 ' 127.' | awk '{print $2}' )"
 slxip=${slxip%/*}
 [ -z "$slxip" ] && read -r _ _ slxip _ <<<"$SSH_CONNECTION"
 [ -z "$slxip" ] && slxip="noip???"
 slxcol=32
+slxchar='$'
 (( UID == 0 )) && slxcol=31
+(( UID == 0 )) && slxchar='#'
 PS1="\[\033[01;${slxcol}m\]\u\[\033[00m\]@\[\033[01;32m\]\h \[\033[00m\]($slxip)
-\[\033[01;34m\]\w\[\033[00m\] # "
-unset ifname slxip slxcol
+\[\033[01;34m\]\w\[\033[00m\] $slxchar "
+unset slxif slxip slxcol slxchar
 # We always want to run this as root; sudo is a noop in case we already are.
 alias tmate='sudo tmate'
-- 
cgit v1.2.3-55-g7522