diff --git a/configs/shells/bash/info.sh b/configs/shells/bash/info.sh index b029333..dd42aed 100644 --- a/configs/shells/bash/info.sh +++ b/configs/shells/bash/info.sh @@ -1,38 +1,33 @@ # Define red and green based on the shell if [ -n "$BASH_VERSION" ]; then - red='\033[0;31m' - green='\033[0;32m' - reset_color='\033[0m' -elif [ -n "$ZSH_VERSION" ]; then - red="$fg[red]" - green="$fg[green]" + red='\033[0;31m' + green='\033[0;32m' + reset_color='\033[0m' + elif [ -n "$ZSH_VERSION" ]; then + red="$fg[red]" + green="$fg[green]" fi # Different OSes have different ways of displaying info if [ $(uname -s | grep -c BSD) -gt 0 ]; then # BSD - echo -e "${green}Platform:$reset_color $(uname -s) $(uname -r) $(uname -p)" - -elif [ $(uname -o | grep -c Msys) -gt 0 ]; then # Windows - echo -e "${green}Platform:$reset_color $(uname -o) $(uname -r)" - + echo -e "${green}Platform:$reset_color $(uname -s) $(uname -r) $(uname -p)" + + elif [ $(uname -o | grep -c Msys) -gt 0 ]; then # Windows + echo -e "${green}Platform:$reset_color $(uname -o) $(uname -r)" + else # Linux-y things - echo -e "${green}Platform:$reset_color $(uname -o) $(uname -r)" - echo -e "${green}Uptime:$reset_color $(uptime -p)" + echo -e "${green}Platform:$reset_color $(uname -o) $(uname -r)" + echo -e "${green}Uptime:$reset_color $(uptime -p)" fi # Determine if $EWCONFIG_ROOT contains uncommitted changes +# Skip this if on Windows if [ -d $EWCONFIG_ROOT/.git ]; then - if [ -n "$(git -C $EWCONFIG_ROOT status --porcelain)" ]; then - echo -e "${red}ewconfig contains uncommitted changes$reset_color" - fi + if [ $(uname -o | grep -c Msys) -eq 0 ]; then + if [ -n "$(git -C $EWCONFIG_ROOT status --porcelain)" ]; then + echo -e "${red}ewconfig contains uncommitted changes$reset_color" + fi + fi fi -# # Determine if $EWCONFIG_ROOT is up-to-date with origin. Only do this if we have network connectivity. -# if [ -d $EWCONFIG_ROOT/.git ]; then -# if ping -c 1 -W 1 git.github.com &> /dev/null; then -# if [ -n "$(git -C $EWCONFIG_ROOT fetch --dry-run 2>&1 | grep -v 'up to date')" ]; then -# echo "$fg[yellow]ewconfig is not up-to-date with origin$reset_color" -# fi -# fi -# fi \ No newline at end of file