From ef01143dbe5ca955f58b1b04fb32bff97149530c Mon Sep 17 00:00:00 2001 From: tteckster Date: Fri, 3 Feb 2023 05:08:14 -0500 Subject: [PATCH] check for root password --- install/adguard-v5-install.sh | 5 ++--- install/audiobookshelf-v5-install.sh | 5 ++--- install/autobrr-v5-install.sh | 5 ++--- install/blocky-v5-install.sh | 5 ++--- install/casaos-v5-install.sh | 5 ++--- install/changedetection-v5-install.sh | 5 ++--- install/cronicle-v5-install.sh | 5 ++--- install/daemonsync-v5-install.sh | 5 ++--- install/dashy-v5-install.sh | 5 ++--- install/debian-v5-install.sh | 2 +- install/deconz-v5-install.sh | 5 ++--- install/deluge-v5-install.sh | 5 ++--- install/docker-v5-install.sh | 5 ++--- install/emby-v5-install.sh | 5 ++--- install/emqx-v5-install.sh | 5 ++--- install/esphome-v5-install.sh | 5 ++--- install/grafana-v5-install.sh | 5 ++--- install/grocy-v5-install.sh | 5 ++--- install/heimdalldashboard-v5-install.sh | 5 ++--- install/homeassistant-core-v5-install.sh | 5 ++--- install/homeassistant-v5-install.sh | 5 ++--- install/homebridge-v5-install.sh | 5 ++--- install/homepage-v5-install.sh | 5 ++--- install/homer-v5-install.sh | 5 ++--- install/hyperion-v5-install.sh | 5 ++--- install/influxdb-v5-install.sh | 5 ++--- install/iobroker-v5-install.sh | 5 ++--- install/jellyfin-v5-install.sh | 5 ++--- install/k0s-v5-install.sh | 5 ++--- install/kavita-v5-install.sh | 5 ++--- install/keycloak-v5-install.sh | 5 ++--- install/lidarr-v5-install.sh | 5 ++--- install/magicmirror-v5-install.sh | 5 ++--- install/mariadb-v5-install.sh | 5 ++--- install/meshcentral-v5-install.sh | 5 ++--- install/motioneye-v5-install.sh | 5 ++--- install/mqtt-v5-install.sh | 5 ++--- install/n8n-v5-install.sh | 5 ++--- install/navidrome-v5-install.sh | 5 ++--- install/nextcloudpi-v5-install.sh | 5 ++--- install/nginxproxymanager-v5-install.sh | 5 ++--- install/nocodb-v5-install.sh | 5 ++--- install/node-red-v5-install.sh | 5 ++--- install/omada-v5-install.sh | 5 ++--- install/omv-v5-install.sh | 5 ++--- install/openhab-v5-install.sh | 5 ++--- install/paperless-ngx-v5-install.sh | 5 ++--- install/photoprism-v5-install.sh | 5 ++--- install/pihole-v5-install.sh | 5 ++--- install/plex-v5-install.sh | 5 ++--- install/podman-homeassistant-v5-install.sh | 5 ++--- install/podman-v5-install.sh | 5 ++--- install/postgresql-v5-install.sh | 5 ++--- install/prometheus-v5-install.sh | 5 ++--- install/prowlarr-v5-install.sh | 5 ++--- install/radarr-v5-install.sh | 5 ++--- install/readarr-v5-install.sh | 5 ++--- install/sabnzbd-v5-install.sh | 5 ++--- install/scrypted-v5-install.sh | 5 ++--- install/shinobi-v5-install.sh | 5 ++--- install/sonarr-v5-install.sh | 5 ++--- install/syncthing-v5-install.sh | 5 ++--- install/tdarr-v5-install.sh | 5 ++--- install/technitiumdns-v5-install.sh | 5 ++--- install/transmission-v5-install.sh | 5 ++--- install/trilium-v5-install.sh | 5 ++--- install/ubuntu-v5-install.sh | 5 ++--- install/umbrel-v5-install.sh | 5 ++--- install/unifi-v5-install.sh | 5 ++--- install/uptimekuma-v5-install.sh | 5 ++--- install/vaultwarden-v5-install.sh | 5 ++--- install/whisparr-v5-install.sh | 5 ++--- install/whoogle-v5-install.sh | 5 ++--- install/wikijs-v5-install.sh | 5 ++--- install/wireguard-v5-install.sh | 5 ++--- install/yunohost-v5-install.sh | 5 ++--- install/zigbee2mqtt-v5-install.sh | 5 ++--- install/zwave-js-ui-v5-install.sh | 5 ++--- 78 files changed, 155 insertions(+), 232 deletions(-) diff --git a/install/adguard-v5-install.sh b/install/adguard-v5-install.sh index 757adb67..8a470079 100644 --- a/install/adguard-v5-install.sh +++ b/install/adguard-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -95,8 +95,7 @@ rm install.sh msg_ok "Installed AdGuard Home" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/audiobookshelf-v5-install.sh b/install/audiobookshelf-v5-install.sh index 3ecac26b..8c388f8f 100644 --- a/install/audiobookshelf-v5-install.sh +++ b/install/audiobookshelf-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -93,8 +93,7 @@ $STD apt install audiobookshelf msg_ok "Installed audiobookshelf" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/autobrr-v5-install.sh b/install/autobrr-v5-install.sh index b5fec8e4..f6350ab2 100644 --- a/install/autobrr-v5-install.sh +++ b/install/autobrr-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -114,8 +114,7 @@ systemctl enable --now -q autobrr.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/blocky-v5-install.sh b/install/blocky-v5-install.sh index cfe3d357..f44b8f25 100644 --- a/install/blocky-v5-install.sh +++ b/install/blocky-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -347,8 +347,7 @@ $STD systemctl enable --now blocky msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/casaos-v5-install.sh b/install/casaos-v5-install.sh index ca39aa37..5e26fd0b 100644 --- a/install/casaos-v5-install.sh +++ b/install/casaos-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -103,8 +103,7 @@ $STD bash <(curl -fsSL https://get.casaos.io) msg_ok "Installed CasaOS" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/changedetection-v5-install.sh b/install/changedetection-v5-install.sh index 9510ccfd..8e2a7002 100644 --- a/install/changedetection-v5-install.sh +++ b/install/changedetection-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -107,8 +107,7 @@ $STD systemctl enable --now changedetection msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/cronicle-v5-install.sh b/install/cronicle-v5-install.sh index c3aa5396..b625e8d0 100644 --- a/install/cronicle-v5-install.sh +++ b/install/cronicle-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -113,8 +113,7 @@ $STD update-rc.d cronicled defaults msg_ok "Installed Cronicle Primary Server" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/daemonsync-v5-install.sh b/install/daemonsync-v5-install.sh index f2354215..6aba7e89 100644 --- a/install/daemonsync-v5-install.sh +++ b/install/daemonsync-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -92,8 +92,7 @@ $STD dpkg -i daemonsync_2.2.0.0059_amd64.deb msg_ok "Installed Daemon Sync Server" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/dashy-v5-install.sh b/install/dashy-v5-install.sh index 39f65305..5b465d9f 100644 --- a/install/dashy-v5-install.sh +++ b/install/dashy-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -123,8 +123,7 @@ systemctl start dashy msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/debian-v5-install.sh b/install/debian-v5-install.sh index 20ceae97..6b3c9c50 100644 --- a/install/debian-v5-install.sh +++ b/install/debian-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e diff --git a/install/deconz-v5-install.sh b/install/deconz-v5-install.sh index 621136a1..76062466 100644 --- a/install/deconz-v5-install.sh +++ b/install/deconz-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -116,8 +116,7 @@ $STD systemctl enable --now deconz msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/deluge-v5-install.sh b/install/deluge-v5-install.sh index d304a942..c1a24f68 100644 --- a/install/deluge-v5-install.sh +++ b/install/deluge-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -130,8 +130,7 @@ systemctl enable --now -q deluge-web.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/docker-v5-install.sh b/install/docker-v5-install.sh index 8db5b9a3..f41e08ec 100644 --- a/install/docker-v5-install.sh +++ b/install/docker-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -147,8 +147,7 @@ if [[ $DOCKER_COMPOSE == "Y" ]]; then fi echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/emby-v5-install.sh b/install/emby-v5-install.sh index cfd5fa64..63f7dd2b 100644 --- a/install/emby-v5-install.sh +++ b/install/emby-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -106,8 +106,7 @@ $STD dpkg -i emby-server-deb_${LATEST}_amd64.deb msg_ok "Installed Emby" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/emqx-v5-install.sh b/install/emqx-v5-install.sh index 62248bf0..7858a7e0 100644 --- a/install/emqx-v5-install.sh +++ b/install/emqx-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -91,8 +91,7 @@ $STD systemctl enable --now emqx msg_ok "Installed EMQX" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/esphome-v5-install.sh b/install/esphome-v5-install.sh index f3114e65..2d7f40d8 100644 --- a/install/esphome-v5-install.sh +++ b/install/esphome-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -112,8 +112,7 @@ systemctl start esphomeDashboard msg_ok "Installed ESPHome Dashboard" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/grafana-v5-install.sh b/install/grafana-v5-install.sh index 5478dd41..70543722 100644 --- a/install/grafana-v5-install.sh +++ b/install/grafana-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -99,8 +99,7 @@ $STD apt-get install -y grafana msg_ok "Installed Grafana" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/grocy-v5-install.sh b/install/grocy-v5-install.sh index 4661850b..e3075ce6 100644 --- a/install/grocy-v5-install.sh +++ b/install/grocy-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -129,8 +129,7 @@ systemctl reload apache2 msg_ok "Installed grocy" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/heimdalldashboard-v5-install.sh b/install/heimdalldashboard-v5-install.sh index 61b8202e..e1059a08 100644 --- a/install/heimdalldashboard-v5-install.sh +++ b/install/heimdalldashboard-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -123,8 +123,7 @@ $STD sudo systemctl enable --now heimdall.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/homeassistant-core-v5-install.sh b/install/homeassistant-core-v5-install.sh index 4fcec362..63bceca8 100644 --- a/install/homeassistant-core-v5-install.sh +++ b/install/homeassistant-core-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -165,8 +165,7 @@ $STD systemctl enable --now homeassistant msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/homeassistant-v5-install.sh b/install/homeassistant-v5-install.sh index 3f2511e3..f87c631a 100644 --- a/install/homeassistant-v5-install.sh +++ b/install/homeassistant-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -150,8 +150,7 @@ $STD docker run -d \ msg_ok "Installed Home Assistant $CORE_LATEST_VERSION" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/homebridge-v5-install.sh b/install/homebridge-v5-install.sh index 6c61ed4f..13e9d81d 100644 --- a/install/homebridge-v5-install.sh +++ b/install/homebridge-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -102,8 +102,7 @@ $STD hb-service install --user homebridge msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/homepage-v5-install.sh b/install/homepage-v5-install.sh index a2658274..68a1fae2 100644 --- a/install/homepage-v5-install.sh +++ b/install/homepage-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -122,8 +122,7 @@ $STD systemctl enable --now homepage msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/homer-v5-install.sh b/install/homer-v5-install.sh index 41e707d1..4211357f 100644 --- a/install/homer-v5-install.sh +++ b/install/homer-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -111,8 +111,7 @@ $STD systemctl enable --now homer msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/hyperion-v5-install.sh b/install/hyperion-v5-install.sh index bdcb4927..3f29b6f1 100644 --- a/install/hyperion-v5-install.sh +++ b/install/hyperion-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -96,8 +96,7 @@ $STD systemctl enable --now hyperion@root.service msg_ok "Installed Hyperion" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/influxdb-v5-install.sh b/install/influxdb-v5-install.sh index 869f3d25..4dfb3864 100644 --- a/install/influxdb-v5-install.sh +++ b/install/influxdb-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -125,8 +125,7 @@ if [[ $TELEGRAF == "Y" ]]; then fi echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/iobroker-v5-install.sh b/install/iobroker-v5-install.sh index ceaf5219..499a025a 100644 --- a/install/iobroker-v5-install.sh +++ b/install/iobroker-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -90,8 +90,7 @@ $STD bash <(curl -fsSL https://iobroker.net/install.sh) msg_ok "Installed ioBroker" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/jellyfin-v5-install.sh b/install/jellyfin-v5-install.sh index d53d034a..c51bda7f 100644 --- a/install/jellyfin-v5-install.sh +++ b/install/jellyfin-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -130,8 +130,7 @@ ln -s /usr/share/jellyfin/web/ /usr/lib/jellyfin/bin/jellyfin-web msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/k0s-v5-install.sh b/install/k0s-v5-install.sh index 88bc1902..74191d2e 100644 --- a/install/k0s-v5-install.sh +++ b/install/k0s-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -106,8 +106,7 @@ $STD bash <(curl -sSLf https://raw.githubusercontent.com/helm/helm/main/scripts/ msg_ok "Installed Helm" fi echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/kavita-v5-install.sh b/install/kavita-v5-install.sh index 01e460f7..7f192a30 100644 --- a/install/kavita-v5-install.sh +++ b/install/kavita-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -112,8 +112,7 @@ systemctl enable --now -q kavita.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/keycloak-v5-install.sh b/install/keycloak-v5-install.sh index 0cd8bd0f..16aab834 100644 --- a/install/keycloak-v5-install.sh +++ b/install/keycloak-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -109,8 +109,7 @@ $STD systemctl enable --now keycloak.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/lidarr-v5-install.sh b/install/lidarr-v5-install.sh index 9c7a418c..bb3f808f 100644 --- a/install/lidarr-v5-install.sh +++ b/install/lidarr-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -116,8 +116,7 @@ systemctl enable --now -q lidarr msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/magicmirror-v5-install.sh b/install/magicmirror-v5-install.sh index 2813d6ce..c0b38e13 100644 --- a/install/magicmirror-v5-install.sh +++ b/install/magicmirror-v5-install.sh @@ -74,7 +74,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -218,8 +218,7 @@ $STD systemctl enable --now magicmirror msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/mariadb-v5-install.sh b/install/mariadb-v5-install.sh index 6b3f26dc..698b27aa 100644 --- a/install/mariadb-v5-install.sh +++ b/install/mariadb-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -107,8 +107,7 @@ if [[ $ADMINER == "Y" ]]; then fi echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/meshcentral-v5-install.sh b/install/meshcentral-v5-install.sh index 8971b769..b84bcd8a 100644 --- a/install/meshcentral-v5-install.sh +++ b/install/meshcentral-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -101,8 +101,7 @@ $STD node node_modules/meshcentral --install msg_ok "Installed MeshCentral" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/motioneye-v5-install.sh b/install/motioneye-v5-install.sh index defcc686..7d16d785 100644 --- a/install/motioneye-v5-install.sh +++ b/install/motioneye-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -120,8 +120,7 @@ systemctl start motioneye msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/mqtt-v5-install.sh b/install/mqtt-v5-install.sh index 46def071..7f5dac54 100644 --- a/install/mqtt-v5-install.sh +++ b/install/mqtt-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -97,8 +97,7 @@ $STD apt-get -y install mosquitto-clients msg_ok "Installed Mosquitto MQTT Broker" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/n8n-v5-install.sh b/install/n8n-v5-install.sh index 049eba29..67f860c2 100644 --- a/install/n8n-v5-install.sh +++ b/install/n8n-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -112,8 +112,7 @@ $STD systemctl enable --now n8n msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/navidrome-v5-install.sh b/install/navidrome-v5-install.sh index d412a068..19e9af40 100644 --- a/install/navidrome-v5-install.sh +++ b/install/navidrome-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -140,8 +140,7 @@ $STD systemctl enable --now navidrome.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/nextcloudpi-v5-install.sh b/install/nextcloudpi-v5-install.sh index 236f82c9..553615a8 100644 --- a/install/nextcloudpi-v5-install.sh +++ b/install/nextcloudpi-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -92,8 +92,7 @@ service apache2 restart msg_ok "Installed NextCloudPi" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/nginxproxymanager-v5-install.sh b/install/nginxproxymanager-v5-install.sh index c680b9f2..34b22888 100644 --- a/install/nginxproxymanager-v5-install.sh +++ b/install/nginxproxymanager-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -244,8 +244,7 @@ EOF msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/nocodb-v5-install.sh b/install/nocodb-v5-install.sh index 536549cd..624869cc 100644 --- a/install/nocodb-v5-install.sh +++ b/install/nocodb-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -119,8 +119,7 @@ systemctl enable --now nocodb.service &>/dev/null msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/node-red-v5-install.sh b/install/node-red-v5-install.sh index 15ccf9af..7a9522ef 100644 --- a/install/node-red-v5-install.sh +++ b/install/node-red-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -122,8 +122,7 @@ $STD systemctl enable --now nodered.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/omada-v5-install.sh b/install/omada-v5-install.sh index 0bc87137..78ed61ed 100644 --- a/install/omada-v5-install.sh +++ b/install/omada-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -96,8 +96,7 @@ $STD dpkg -i Omada_SDN_Controller_v5.7.4_Linux_x64.deb msg_ok "Installed Omada Controller" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/omv-v5-install.sh b/install/omv-v5-install.sh index 0b809bf9..eb1e9f36 100644 --- a/install/omv-v5-install.sh +++ b/install/omv-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -108,8 +108,7 @@ omv-confdbadm populate msg_ok "Installed OpenMediaVault" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/openhab-v5-install.sh b/install/openhab-v5-install.sh index ea750f17..e6a6241e 100644 --- a/install/openhab-v5-install.sh +++ b/install/openhab-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -107,8 +107,7 @@ $STD systemctl enable --now openhab.service msg_ok "Installed openHAB" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/paperless-ngx-v5-install.sh b/install/paperless-ngx-v5-install.sh index 3bb216a3..092962d3 100644 --- a/install/paperless-ngx-v5-install.sh +++ b/install/paperless-ngx-v5-install.sh @@ -74,7 +74,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -268,8 +268,7 @@ $STD systemctl enable --now paperless-consumer paperless-webserver paperless-sch msg_ok "Created Services" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/photoprism-v5-install.sh b/install/photoprism-v5-install.sh index 68df0ac9..eeb17b1f 100644 --- a/install/photoprism-v5-install.sh +++ b/install/photoprism-v5-install.sh @@ -71,7 +71,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -180,8 +180,7 @@ WantedBy=multi-user.target" >$service_path msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/pihole-v5-install.sh b/install/pihole-v5-install.sh index 0dabca98..79f7a581 100644 --- a/install/pihole-v5-install.sh +++ b/install/pihole-v5-install.sh @@ -71,7 +71,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -113,8 +113,7 @@ $STD bash <(curl -fsSL https://install.pi-hole.net) /dev/stdin --unattended msg_ok "Installed Pi-hole" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/plex-v5-install.sh b/install/plex-v5-install.sh index 34453a82..9efe7f52 100644 --- a/install/plex-v5-install.sh +++ b/install/plex-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -110,8 +110,7 @@ $STD apt-get -o Dpkg::Options::="--force-confold" install -y plexmediaserver msg_ok "Installed Plex Media Server" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/podman-homeassistant-v5-install.sh b/install/podman-homeassistant-v5-install.sh index 2b90b01c..d5cc09ac 100644 --- a/install/podman-homeassistant-v5-install.sh +++ b/install/podman-homeassistant-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -112,8 +112,7 @@ $STD systemctl enable --now homeassistant msg_ok "Installed Home Assistant" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/podman-v5-install.sh b/install/podman-v5-install.sh index 5a01254e..5e3ee54e 100644 --- a/install/podman-v5-install.sh +++ b/install/podman-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -91,8 +91,7 @@ echo -e 'unqualified-search-registries=["docker.io"]' >> /etc/containers/registr msg_ok "Installed Podman" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/postgresql-v5-install.sh b/install/postgresql-v5-install.sh index 1267e262..5dec0463 100644 --- a/install/postgresql-v5-install.sh +++ b/install/postgresql-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -214,8 +214,7 @@ if [[ $ADMINER == "Y" ]]; then fi echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/prometheus-v5-install.sh b/install/prometheus-v5-install.sh index 81566633..a9f1e02e 100644 --- a/install/prometheus-v5-install.sh +++ b/install/prometheus-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -121,8 +121,7 @@ $STD sudo systemctl enable --now prometheus msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/prowlarr-v5-install.sh b/install/prowlarr-v5-install.sh index 15fb7561..e99ec807 100644 --- a/install/prowlarr-v5-install.sh +++ b/install/prowlarr-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -114,8 +114,7 @@ systemctl enable --now -q prowlarr msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/radarr-v5-install.sh b/install/radarr-v5-install.sh index a914ba9c..3aadda80 100644 --- a/install/radarr-v5-install.sh +++ b/install/radarr-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -114,8 +114,7 @@ systemctl enable --now -q radarr msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/readarr-v5-install.sh b/install/readarr-v5-install.sh index 25139e4f..935de934 100644 --- a/install/readarr-v5-install.sh +++ b/install/readarr-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -114,8 +114,7 @@ systemctl enable --now -q readarr msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/sabnzbd-v5-install.sh b/install/sabnzbd-v5-install.sh index 9af332b4..6c04b6d1 100644 --- a/install/sabnzbd-v5-install.sh +++ b/install/sabnzbd-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -119,8 +119,7 @@ systemctl enable --now -q sabnzbd.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/scrypted-v5-install.sh b/install/scrypted-v5-install.sh index 576d3d7d..105c1b5a 100644 --- a/install/scrypted-v5-install.sh +++ b/install/scrypted-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -179,8 +179,7 @@ WantedBy=multi-user.target" >$service_path $STD systemctl enable --now scrypted.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/shinobi-v5-install.sh b/install/shinobi-v5-install.sh index f392e3b0..4c34457d 100644 --- a/install/shinobi-v5-install.sh +++ b/install/shinobi-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -148,8 +148,7 @@ $STD pm2 list msg_ok "Installed Shinobi" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/sonarr-v5-install.sh b/install/sonarr-v5-install.sh index 4c72a87c..275aa674 100644 --- a/install/sonarr-v5-install.sh +++ b/install/sonarr-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -95,8 +95,7 @@ $STD apt-get -o Dpkg::Options::="--force-confold" install -y sonarr msg_ok "Installed Sonarr" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/syncthing-v5-install.sh b/install/syncthing-v5-install.sh index 490c2137..cee21102 100644 --- a/install/syncthing-v5-install.sh +++ b/install/syncthing-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -98,8 +98,7 @@ systemctl restart syncthing@root.service msg_ok "Installed Syncthing" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/tdarr-v5-install.sh b/install/tdarr-v5-install.sh index 37893679..42b2d69a 100644 --- a/install/tdarr-v5-install.sh +++ b/install/tdarr-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -141,8 +141,7 @@ systemctl enable --now -q tdarr-node.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/technitiumdns-v5-install.sh b/install/technitiumdns-v5-install.sh index 00a01dee..230d5af2 100644 --- a/install/technitiumdns-v5-install.sh +++ b/install/technitiumdns-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -93,8 +93,7 @@ $STD bash <(curl -fsSL https://download.technitium.com/dns/install.sh) msg_ok "Installed Technitium DNS" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/transmission-v5-install.sh b/install/transmission-v5-install.sh index f4d27365..16edcd40 100644 --- a/install/transmission-v5-install.sh +++ b/install/transmission-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -93,8 +93,7 @@ systemctl start transmission-daemon msg_ok "Installed Transmission" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/trilium-v5-install.sh b/install/trilium-v5-install.sh index 8bb0f555..37527af7 100644 --- a/install/trilium-v5-install.sh +++ b/install/trilium-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -115,8 +115,7 @@ systemctl enable --now -q trilium msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/ubuntu-v5-install.sh b/install/ubuntu-v5-install.sh index b5f61c2f..dd99bf46 100644 --- a/install/ubuntu-v5-install.sh +++ b/install/ubuntu-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -86,8 +86,7 @@ $STD apt-get install -y mc msg_ok "Installed Dependencies" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/umbrel-v5-install.sh b/install/umbrel-v5-install.sh index a34692a1..6557e184 100644 --- a/install/umbrel-v5-install.sh +++ b/install/umbrel-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -104,8 +104,7 @@ $STD systemctl enable --now umbrel-startup.service msg_ok "Installed Umbrel" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/unifi-v5-install.sh b/install/unifi-v5-install.sh index 487cebae..a8350f7c 100644 --- a/install/unifi-v5-install.sh +++ b/install/unifi-v5-install.sh @@ -71,7 +71,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -99,8 +99,7 @@ $STD bash unifi-latest.sh --skip --add-repository $LOCAL msg_ok "Installed UniFi Network Application" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/uptimekuma-v5-install.sh b/install/uptimekuma-v5-install.sh index 257d4b40..4a6bbd53 100644 --- a/install/uptimekuma-v5-install.sh +++ b/install/uptimekuma-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -119,8 +119,7 @@ $STD systemctl enable --now uptime-kuma.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/vaultwarden-v5-install.sh b/install/vaultwarden-v5-install.sh index b9ecf7f1..407808df 100644 --- a/install/vaultwarden-v5-install.sh +++ b/install/vaultwarden-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -176,8 +176,7 @@ $STD systemctl enable --now vaultwarden.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/whisparr-v5-install.sh b/install/whisparr-v5-install.sh index efd8b058..aa665884 100644 --- a/install/whisparr-v5-install.sh +++ b/install/whisparr-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -114,8 +114,7 @@ systemctl enable --now -q whisparr msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/whoogle-v5-install.sh b/install/whoogle-v5-install.sh index 911e1f61..a786621b 100644 --- a/install/whoogle-v5-install.sh +++ b/install/whoogle-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -108,8 +108,7 @@ $STD systemctl enable --now whoogle.service msg_ok "Installed Whoogle" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/wikijs-v5-install.sh b/install/wikijs-v5-install.sh index 258b9135..c02ba072 100644 --- a/install/wikijs-v5-install.sh +++ b/install/wikijs-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -136,8 +136,7 @@ $STD systemctl enable --now wikijs msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/wireguard-v5-install.sh b/install/wireguard-v5-install.sh index 9cd9be63..ea88b7aa 100644 --- a/install/wireguard-v5-install.sh +++ b/install/wireguard-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -108,8 +108,7 @@ $STD bash <(curl -fsSL https://install.pivpn.io) --unattended options.conf msg_ok "Installed WireGuard" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/yunohost-v5-install.sh b/install/yunohost-v5-install.sh index 7f008213..5d4a982b 100644 --- a/install/yunohost-v5-install.sh +++ b/install/yunohost-v5-install.sh @@ -69,7 +69,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -95,8 +95,7 @@ $STD bash <(curl -fsSL https://install.yunohost.org) -a msg_ok "Installed YunoHost" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" chmod -x /etc/update-motd.d/* touch ~/.hushlogin diff --git a/install/zigbee2mqtt-v5-install.sh b/install/zigbee2mqtt-v5-install.sh index e433aae0..9548f285 100644 --- a/install/zigbee2mqtt-v5-install.sh +++ b/install/zigbee2mqtt-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -135,8 +135,7 @@ $STD systemctl enable zigbee2mqtt.service msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname diff --git a/install/zwave-js-ui-v5-install.sh b/install/zwave-js-ui-v5-install.sh index 7456abc8..2f1f2742 100644 --- a/install/zwave-js-ui-v5-install.sh +++ b/install/zwave-js-ui-v5-install.sh @@ -70,7 +70,7 @@ if nc -zw1 8.8.8.8 443; then msg_ok "Internet Connected"; else fi fi RESOLVEDIP=$(nslookup "github.com" | awk -F':' '/^Address: / { matched = 1 } matched { print $2}' | xargs) -if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to $RESOLVEDIP"; fi +if [[ -z "$RESOLVEDIP" ]]; then msg_error "DNS Lookup Failure"; else msg_ok "DNS Resolved github.com to ${BL}$RESOLVEDIP${CL}"; fi alias die='EXIT=$? LINE=$LINENO error_exit' set -e @@ -111,8 +111,7 @@ $STD systemctl enable zwave-js-ui msg_ok "Created Service" echo "export TERM='xterm-256color'" >>/root/.bashrc -passwd -S root | grep -q "P" -if [ $? -ne 0 ]; then +if ! getent shadow root | grep -q "^root:[^\!*]"; then msg_info "Customizing Container" rm /etc/motd rm /etc/update-motd.d/10-uname