Latest
This commit is contained in:
parent
bffbbe8e4d
commit
4128167ef0
2 changed files with 11 additions and 6 deletions
|
@ -13,8 +13,8 @@ if [ ! -d "$SDKMAN_DIR" ]; then
|
||||||
logg info 'Installing SDKMan via `curl -s "https://get.sdkman.io?rcupdate=false`'
|
logg info 'Installing SDKMan via `curl -s "https://get.sdkman.io?rcupdate=false`'
|
||||||
logg info "Install directory: $SDKMAN_DIR"
|
logg info "Install directory: $SDKMAN_DIR"
|
||||||
curl -s "https://get.sdkman.io?rcupdate=false" | bash
|
curl -s "https://get.sdkman.io?rcupdate=false" | bash
|
||||||
logg info 'Running `sdk install java`'
|
logg info 'Running `sdk install java` with bash -c'
|
||||||
sdk install java
|
bash -c 'sdk install java'
|
||||||
else
|
else
|
||||||
logg info 'SDKMan appears to already be installed.'
|
logg info 'SDKMan appears to already be installed.'
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -266,10 +266,15 @@ print_banner() {
|
||||||
printf " \\033[%sm%s OS \\033[0m %s\\n" "$UPDATES_ZERO_COLOR" "" "macOS $(sw_vers -productVersion) / Build $(sw_vers -buildVersion)"
|
printf " \\033[%sm%s OS \\033[0m %s\\n" "$UPDATES_ZERO_COLOR" "" "macOS $(sw_vers -productVersion) / Build $(sw_vers -buildVersion)"
|
||||||
printf " \\033[%sm%s UUID \\033[0m %s\\n" "$PODMAN_RUNNING_COLOR" "" "$(ioreg -d2 -c IOPlatformExpertDevice | awk -F\" '/IOPlatformUUID/{print $(NF-1)}')"
|
printf " \\033[%sm%s UUID \\033[0m %s\\n" "$PODMAN_RUNNING_COLOR" "" "$(ioreg -d2 -c IOPlatformExpertDevice | awk -F\" '/IOPlatformUUID/{print $(NF-1)}')"
|
||||||
printf " \\033[%sm%s LAN IP \\033[0m %s\\n" "$BANNER_KERNEL_COLOR" "ﯱ" "$(ifconfig en0 2>/dev/null | grep 'inet ' | cut -d ' ' -f 2)"
|
printf " \\033[%sm%s LAN IP \\033[0m %s\\n" "$BANNER_KERNEL_COLOR" "ﯱ" "$(ifconfig en0 2>/dev/null | grep 'inet ' | cut -d ' ' -f 2)"
|
||||||
IP_ADDR_PUB="$(timeout 1 sh -c 'curl -sSL ifconfig.me')"
|
### Disabled because it causes slight delay due to server call for public IP
|
||||||
if [ -n "$IP_ADDR_PUB" ]; then
|
# if command -v timeout > /dev/null; then
|
||||||
printf " \\033[%sm%s Public IP\\033[0m %s\\n" "$UPDATES_SECURITY_COLOR" "" "$IP_ADDR_PUB"
|
# IP_ADDR_PUB="$(timeout 1 sh -c 'curl -sSL ifconfig.me')"
|
||||||
fi
|
# else
|
||||||
|
# IP_ADDR_PUB="$(sh -c 'curl -sSL ifconfig.me')"
|
||||||
|
# fi
|
||||||
|
# if [ -n "$IP_ADDR_PUB" ]; then
|
||||||
|
# printf " \\033[%sm%s Public IP\\033[0m %s\\n" "$UPDATES_SECURITY_COLOR" "" "$IP_ADDR_PUB"
|
||||||
|
# fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue