From fcda37b1238816cc7ec05cda2881c78b59395b83 Mon Sep 17 00:00:00 2001 From: ec2-user Date: Fri, 30 Apr 2021 15:00:19 +0200 Subject: [PATCH] Fixed wrong color handling and FQDN if no domainname is configured. --- dot_bashrc.d/executable_10.prompt.tmpl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dot_bashrc.d/executable_10.prompt.tmpl b/dot_bashrc.d/executable_10.prompt.tmpl index 5fd671f..34878f1 100644 --- a/dot_bashrc.d/executable_10.prompt.tmpl +++ b/dot_bashrc.d/executable_10.prompt.tmpl @@ -2,7 +2,11 @@ # System Name and type detectedn # mySystem=$(uname -n) -myFQDN="$(uname -n).$(dnsdomainname)" +if dnsdomainname &> /dev/null ; then + myFQDN=$(uname -n).$(dnsdomainname) +else + myFQDN=$(uname -n) +fi myCategory="{{.bash.prompt.category}}" myColor="{{.bash.prompt.color}}" myType="{{.chezmoi.hostname}}" @@ -119,7 +123,7 @@ fast_git_ps1 () # magenta COLOR_MAGENTA 5 max,0,max # cyan COLOR_CYAN 6 0,max,max # white COLOR_WHITE 7 max,max,max -setPrompt "${myCategory}" "${myPrettyName}" "${myColor:-5}" +# setPrompt "${myCategory}" "${myPrettyName}" "${myColor:-5}" if [[ -z "${myType// }" ]]; then TYPE=$(uname -n) @@ -127,7 +131,7 @@ else TYPE=" $myType " fi -setPrompt "${myCategory}" "${myPrettyName}" ${1:-6} +setPrompt "${myCategory}" "${myPrettyName}" ${myColor:-6} # color_my_prompt # TODO: background colors...