Browse Source

Code refactoring

tteckster 2 years ago
parent
commit
c12f2773e7
97 changed files with 103 additions and 119 deletions
  1. 1 1
      install/adguard-install.sh
  2. 1 1
      install/alpine-adguard-install.sh
  3. 1 1
      install/alpine-docker-install.sh
  4. 1 1
      install/alpine-grafana-install.sh
  5. 1 1
      install/alpine-vaultwarden-install.sh
  6. 1 1
      install/alpine-whoogle-install.sh
  7. 1 1
      install/alpine-zigbee2mqtt-install.sh
  8. 1 1
      install/audiobookshelf-install.sh
  9. 1 1
      install/autobrr-install.sh
  10. 1 2
      install/bazarr-install.sh
  11. 1 1
      install/blocky-install.sh
  12. 1 2
      install/casaos-install.sh
  13. 1 1
      install/changedetection-install.sh
  14. 1 1
      install/cloudflared-install.sh
  15. 1 1
      install/cronicle-install.sh
  16. 1 1
      install/daemonsync-install.sh
  17. 1 1
      install/dashy-install.sh
  18. 1 1
      install/debian-install.sh
  19. 1 1
      install/deconz-install.sh
  20. 1 1
      install/deluge-install.sh
  21. 1 1
      install/devuan-install.sh
  22. 1 1
      install/docker-install.sh
  23. 2 2
      install/emby-install.sh
  24. 1 1
      install/emqx-install.sh
  25. 1 1
      install/esphome-install.sh
  26. 1 1
      install/fhem-install.sh
  27. 1 1
      install/go2rtc-install.sh
  28. 1 1
      install/grafana-install.sh
  29. 1 2
      install/grocy-install.sh
  30. 1 1
      install/heimdalldashboard-install.sh
  31. 1 1
      install/homeassistant-core-install.sh
  32. 1 1
      install/homeassistant-install.sh
  33. 1 1
      install/homebridge-install.sh
  34. 1 1
      install/homepage-install.sh
  35. 1 2
      install/homer-install.sh
  36. 1 1
      install/hyperion-install.sh
  37. 1 1
      install/influxdb-install.sh
  38. 1 1
      install/iobroker-install.sh
  39. 1 1
      install/jackett-install.sh
  40. 2 2
      install/jellyfin-install.sh
  41. 1 1
      install/k0s-install.sh
  42. 1 1
      install/kavita-install.sh
  43. 1 1
      install/keycloak-install.sh
  44. 1 1
      install/lidarr-install.sh
  45. 1 1
      install/magicmirror-install.sh
  46. 1 1
      install/mariadb-install.sh
  47. 1 1
      install/meshcentral-install.sh
  48. 1 1
      install/motioneye-install.sh
  49. 1 1
      install/mqtt-install.sh
  50. 1 1
      install/n8n-install.sh
  51. 1 1
      install/navidrome-install.sh
  52. 1 1
      install/nextcloudpi-install.sh
  53. 1 1
      install/nginxproxymanager-install.sh
  54. 1 1
      install/nocodb-install.sh
  55. 1 1
      install/node-red-install.sh
  56. 1 1
      install/octoprint-install.sh
  57. 1 1
      install/omada-install.sh
  58. 1 1
      install/omv-install.sh
  59. 1 1
      install/openhab-install.sh
  60. 2 2
      install/paperless-ngx-install.sh
  61. 1 2
      install/photoprism-install.sh
  62. 1 1
      install/pihole-install.sh
  63. 2 2
      install/plex-install.sh
  64. 1 1
      install/podman-homeassistant-install.sh
  65. 1 1
      install/podman-install.sh
  66. 1 1
      install/postgresql-install.sh
  67. 1 1
      install/prometheus-install.sh
  68. 1 1
      install/prowlarr-install.sh
  69. 1 1
      install/qbittorrent-install.sh
  70. 1 1
      install/radarr-install.sh
  71. 1 1
      install/readarr-install.sh
  72. 1 1
      install/rstptoweb-install.sh
  73. 1 2
      install/sabnzbd-install.sh
  74. 1 1
      install/scrypted-install.sh
  75. 1 1
      install/shinobi-install.sh
  76. 1 1
      install/sonarr-install.sh
  77. 1 1
      install/syncthing-install.sh
  78. 1 1
      install/tautulli-install.sh
  79. 1 2
      install/tdarr-install.sh
  80. 1 1
      install/technitiumdns-install.sh
  81. 1 1
      install/transmission-install.sh
  82. 1 1
      install/trilium-install.sh
  83. 1 1
      install/ubuntu-install.sh
  84. 1 1
      install/umbrel-install.sh
  85. 1 1
      install/unifi-install.sh
  86. 1 1
      install/uptimekuma-install.sh
  87. 1 1
      install/vaultwarden-install.sh
  88. 1 1
      install/whisparr-install.sh
  89. 1 1
      install/whoogle-install.sh
  90. 1 1
      install/wikijs-install.sh
  91. 1 1
      install/wireguard-install.sh
  92. 1 1
      install/yunohost-install.sh
  93. 1 1
      install/zigbee2mqtt-install.sh
  94. 1 2
      install/zwave-js-ui-install.sh
  95. 2 6
      misc/alpine-install.func
  96. 1 1
      misc/build.func
  97. 2 6
      misc/install.func

+ 1 - 1
install/adguard-install.sh

@@ -29,7 +29,7 @@ rm install.sh
 msg_ok "Installed AdGuard Home"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/alpine-adguard-install.sh

@@ -33,4 +33,4 @@ $STD /opt/AdGuardHome/AdGuardHome -s start
 msg_ok "Installed Alpine-AdGuard"
 
 motd_ssh
-root
+customize

+ 1 - 1
install/alpine-docker-install.sh

@@ -59,4 +59,4 @@ if echo "$prompt" | grep -Eq "^(y|yes)$"; then
 fi
 
 motd_ssh
-root
+customize

+ 1 - 1
install/alpine-grafana-install.sh

@@ -29,4 +29,4 @@ $STD rc-update add grafana default
 msg_ok "Installed Grafana"
 
 motd_ssh
-root
+customize

+ 1 - 1
install/alpine-vaultwarden-install.sh

@@ -37,4 +37,4 @@ $STD rc-update add vaultwarden default
 msg_ok "Installed Alpine-Vaultwarden"
 
 motd_ssh
-root
+customize

+ 1 - 1
install/alpine-whoogle-install.sh

@@ -49,4 +49,4 @@ rc-update add -q whoogle default
 msg_ok "Installed Alpine-Whoogle"
 
 motd_ssh
-root
+customize

+ 1 - 1
install/alpine-zigbee2mqtt-install.sh

@@ -26,4 +26,4 @@ $STD apk add zigbee2mqtt
 msg_ok "Installed Alpine-Zigbee2MQTT"
 
 motd_ssh
-root
+customize

+ 1 - 1
install/audiobookshelf-install.sh

@@ -28,7 +28,7 @@ $STD apt install audiobookshelf
 msg_ok "Installed audiobookshelf"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/autobrr-install.sh

@@ -49,7 +49,7 @@ systemctl enable --now -q autobrr.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 2
install/bazarr-install.sh

@@ -17,7 +17,6 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
-$STD apt-get install -y unzip
 $STD apt-get install -y python3-pip
 msg_ok "Installed Dependencies"
 
@@ -53,7 +52,7 @@ systemctl enable -q --now bazarr
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm -rf bazarr.zip

+ 1 - 1
install/blocky-install.sh

@@ -282,7 +282,7 @@ $STD systemctl enable --now blocky
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 2
install/casaos-install.sh

@@ -17,7 +17,6 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
-$STD apt-get install -y unzip
 msg_ok "Installed Dependencies"
 
 msg_info "Installing CasaOS (Patience)"
@@ -37,7 +36,7 @@ $STD bash <(curl -fsSL https://get.casaos.io)
 msg_ok "Installed CasaOS"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/changedetection-install.sh

@@ -43,7 +43,7 @@ $STD systemctl enable --now changedetection
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/cloudflared-install.sh

@@ -28,7 +28,7 @@ $STD apt-get install -y cloudflared
 msg_ok "Installed Cloudflared"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/cronicle-install.sh

@@ -48,7 +48,7 @@ $STD update-rc.d cronicled defaults
 msg_ok "Installed Cronicle Primary Server"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/daemonsync-install.sh

@@ -26,7 +26,7 @@ $STD dpkg -i daemonsync_2.2.0.0059_amd64.deb
 msg_ok "Installed Daemon Sync Server"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm -rf daemonsync_2.2.0.0059_amd64.deb

+ 1 - 1
install/dashy-install.sh

@@ -57,7 +57,7 @@ systemctl start dashy
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/debian-install.sh

@@ -20,7 +20,7 @@ $STD apt-get install -y mc
 msg_ok "Installed Dependencies"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/deconz-install.sh

@@ -50,7 +50,7 @@ $STD systemctl enable --now deconz
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/deluge-install.sh

@@ -65,7 +65,7 @@ systemctl enable --now -q deluge-web.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/devuan-install.sh

@@ -20,7 +20,7 @@ $STD apt-get install -y mc
 msg_ok "Installed Dependencies"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/docker-install.sh

@@ -69,7 +69,7 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
 fi
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 2 - 2
install/emby-install.sh

@@ -19,7 +19,7 @@ $STD apt-get install -y sudo
 $STD apt-get install -y mc
 msg_ok "Installed Dependencies"
 
-if [[ -z "$(grep -w "100000" /proc/self/uid_map)" ]]; then
+if [[ "$CTTYPE" == "0" ]]; then
   msg_info "Setting Up Hardware Acceleration"
   $STD apt-get -y install \
     va-driver-all \
@@ -43,7 +43,7 @@ $STD dpkg -i emby-server-deb_${LATEST}_amd64.deb
 msg_ok "Installed Emby"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/emqx-install.sh

@@ -26,7 +26,7 @@ $STD systemctl enable --now emqx
 msg_ok "Installed EMQX"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 apt-get autoremove >/dev/null

+ 1 - 1
install/esphome-install.sh

@@ -46,7 +46,7 @@ systemctl start esphomeDashboard
 msg_ok "Installed ESPHome Dashboard"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/fhem-install.sh

@@ -32,7 +32,7 @@ $STD apt-get install -y fhem
 msg_info "Installed Fhem"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/go2rtc-install.sh

@@ -43,7 +43,7 @@ systemctl enable -q --now go2rtc
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/grafana-install.sh

@@ -35,7 +35,7 @@ systemctl enable --now -q grafana-server.service
 msg_ok "Installed Grafana"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 2
install/grocy-install.sh

@@ -18,7 +18,6 @@ $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
 $STD apt-get install -y apache2
-$STD apt-get install -y unzip
 $STD apt-get install -y apt-transport-https
 $STD apt-get install -y lsb-release
 msg_ok "Installed Dependencies"
@@ -63,7 +62,7 @@ systemctl reload apache2
 msg_ok "Installed grocy"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/heimdalldashboard-install.sh

@@ -58,7 +58,7 @@ $STD sudo systemctl enable --now heimdall.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/homeassistant-core-install.sh

@@ -100,7 +100,7 @@ $STD systemctl enable --now homeassistant
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/homeassistant-install.sh

@@ -84,7 +84,7 @@ $STD docker run -d \
 msg_ok "Installed Home Assistant $CORE_LATEST_VERSION"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/homebridge-install.sh

@@ -32,7 +32,7 @@ $STD apt-get install -y homebridge
 msg_info "Installed Homebridge"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/homepage-install.sh

@@ -58,7 +58,7 @@ $STD systemctl enable --now homepage
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 2
install/homer-install.sh

@@ -17,7 +17,6 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
-$STD apt-get install -y unzip
 $STD apt-get install -y pip
 msg_ok "Installed Dependencies"
 
@@ -46,7 +45,7 @@ $STD systemctl enable --now homer
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/hyperion-install.sh

@@ -31,7 +31,7 @@ $STD systemctl enable --now hyperion@root.service
 msg_ok "Installed Hyperion"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove >/dev/null

+ 1 - 1
install/influxdb-install.sh

@@ -55,7 +55,7 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
 fi
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/iobroker-install.sh

@@ -24,7 +24,7 @@ $STD bash <(curl -fsSL https://iobroker.net/install.sh)
 msg_ok "Installed ioBroker"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/jackett-install.sh

@@ -46,7 +46,7 @@ systemctl enable -q --now jackett.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 2 - 2
install/jellyfin-install.sh

@@ -20,7 +20,7 @@ $STD apt-get install -y gnupg
 $STD apt-get install -y mc
 msg_ok "Installed Dependencies"
 
-if [[ -z "$(grep -w "100000" /proc/self/uid_map)" ]]; then
+if [[ "$CTTYPE" == "0" ]]; then
   msg_info "Setting Up Hardware Acceleration"
   $STD apt-get -y install \
     va-driver-all \
@@ -59,7 +59,7 @@ $STD apt-get install -y jellyfin
 msg_ok "Installed Jellyfin"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/k0s-install.sh

@@ -35,7 +35,7 @@ $STD bash <(curl -sSLf https://raw.githubusercontent.com/helm/helm/main/scripts/
 msg_ok "Installed Helm"
 fi
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/kavita-install.sh

@@ -46,7 +46,7 @@ systemctl enable --now -q kavita.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/keycloak-install.sh

@@ -43,7 +43,7 @@ $STD systemctl enable --now keycloak.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/lidarr-install.sh

@@ -51,7 +51,7 @@ systemctl enable --now -q lidarr
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm -rf Lidarr.master.*.tar.gz

+ 1 - 1
install/magicmirror-install.sh

@@ -148,7 +148,7 @@ $STD systemctl enable --now magicmirror
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/mariadb-install.sh

@@ -35,7 +35,7 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
 fi
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/meshcentral-install.sh

@@ -35,7 +35,7 @@ $STD node node_modules/meshcentral --install
 msg_ok "Installed MeshCentral"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/motioneye-install.sh

@@ -51,7 +51,7 @@ systemctl enable -q --now motioneye
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/mqtt-install.sh

@@ -31,7 +31,7 @@ $STD apt-get -y install mosquitto-clients
 msg_ok "Installed Mosquitto MQTT Broker"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/n8n-install.sh

@@ -46,7 +46,7 @@ $STD systemctl enable --now n8n
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/navidrome-install.sh

@@ -75,7 +75,7 @@ $STD systemctl enable --now navidrome.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/nextcloudpi-install.sh

@@ -28,7 +28,7 @@ service apache2 restart
 msg_ok "Installed NextCloudPi"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/nginxproxymanager-install.sh

@@ -182,7 +182,7 @@ EOF
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Starting Services"
 sed -i 's/user npm/user root/g; s/^pid/#pid/g' /usr/local/openresty/nginx/conf/nginx.conf

+ 1 - 1
install/nocodb-install.sh

@@ -53,7 +53,7 @@ systemctl enable --now nocodb.service &>/dev/null
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/node-red-install.sh

@@ -56,7 +56,7 @@ $STD systemctl enable --now nodered.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/octoprint-install.sh

@@ -69,7 +69,7 @@ systemctl enable -q --now octoprint.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/omada-install.sh

@@ -30,7 +30,7 @@ $STD dpkg -i Omada_SDN_Controller_v5.9.31_Linux_x64.deb
 msg_ok "Installed Omada Controller"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm -f Omada_SDN_Controller_v5.9.31_Linux_x64.deb mongodb-org-server_3.6.23_amd64.deb

+ 1 - 1
install/omv-install.sh

@@ -42,7 +42,7 @@ omv-confdbadm populate
 msg_ok "Installed OpenMediaVault"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/openhab-install.sh

@@ -41,7 +41,7 @@ $STD systemctl enable --now openhab.service
 msg_ok "Installed openHAB"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 2 - 2
install/paperless-ngx-install.sh

@@ -27,7 +27,7 @@ $STD apt-get install -y --no-install-recommends \
 	redis \
 	postgresql \
 	build-essential \
-        imagemagick \
+    imagemagick \
 	fonts-liberation \
 	optipng \
 	gnupg \
@@ -192,7 +192,7 @@ $STD systemctl enable --now paperless-consumer paperless-webserver paperless-sch
 msg_ok "Created Services"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 2
install/photoprism-install.sh

@@ -23,7 +23,6 @@ $STD apt-get install -y git
 $STD apt-get install -y gnupg
 $STD apt-get install -y make
 $STD apt-get install -y zip
-$STD apt-get install -y unzip
 $STD apt-get install -y exiftool
 $STD apt-get install -y ffmpeg
 msg_ok "Installed Dependencies"
@@ -119,7 +118,7 @@ WantedBy=multi-user.target" >$service_path
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/pihole-install.sh

@@ -46,7 +46,7 @@ $STD bash <(curl -fsSL https://install.pi-hole.net) /dev/stdin --unattended
 msg_ok "Installed Pi-hole"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 2 - 2
install/plex-install.sh

@@ -19,7 +19,7 @@ $STD apt-get install -y sudo
 $STD apt-get install -y mc
 msg_ok "Installed Dependencies"
 
-if [[ -z "$(grep -w "100000" /proc/self/uid_map)" ]]; then
+if [[ "$CTTYPE" == "0" ]]; then
   msg_info "Setting Up Hardware Acceleration"
   $STD apt-get -y install \
     va-driver-all \
@@ -46,7 +46,7 @@ $STD apt-get -o Dpkg::Options::="--force-confold" install -y plexmediaserver
 msg_ok "Installed Plex Media Server"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/podman-homeassistant-install.sh

@@ -46,7 +46,7 @@ $STD systemctl enable --now homeassistant
 msg_ok "Installed Home Assistant"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/podman-install.sh

@@ -26,7 +26,7 @@ echo -e 'unqualified-search-registries=["docker.io"]' >> /etc/containers/registr
 msg_ok "Installed Podman"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/postgresql-install.sh

@@ -142,7 +142,7 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
 fi
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/prometheus-install.sh

@@ -55,7 +55,7 @@ $STD sudo systemctl enable --now prometheus
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/prowlarr-install.sh

@@ -49,7 +49,7 @@ systemctl enable --now -q prowlarr
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm -rf Prowlarr.master.*.tar.gz

+ 1 - 1
install/qbittorrent-install.sh

@@ -38,7 +38,7 @@ systemctl enable -q --now qbittorrent-nox
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/radarr-install.sh

@@ -49,7 +49,7 @@ systemctl enable --now -q radarr
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm -rf Radarr.master.*.tar.gz

+ 1 - 1
install/readarr-install.sh

@@ -49,7 +49,7 @@ systemctl enable --now -q readarr
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm -rf Readarr.develop.*.tar.gz

+ 1 - 1
install/rstptoweb-install.sh

@@ -53,7 +53,7 @@ systemctl enable -q --now rtsptoweb
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 2
install/sabnzbd-install.sh

@@ -17,7 +17,6 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
-$STD apt-get install -y unzip
 $STD apt-get install -y par2
 $STD apt-get install -y p7zip-full
 wget -q http://http.us.debian.org/debian/pool/non-free/u/unrar-nonfree/unrar_6.0.3-1+deb11u1_amd64.deb
@@ -54,7 +53,7 @@ systemctl enable --now -q sabnzbd.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/scrypted-install.sh

@@ -110,7 +110,7 @@ $STD systemctl enable --now scrypted.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/shinobi-install.sh

@@ -82,7 +82,7 @@ $STD pm2 list
 msg_ok "Installed Shinobi"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/sonarr-install.sh

@@ -29,7 +29,7 @@ DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confold" inst
 msg_ok "Installed Sonarr"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/syncthing-install.sh

@@ -33,7 +33,7 @@ systemctl restart syncthing@root.service
 msg_ok "Installed Syncthing"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/tautulli-install.sh

@@ -50,7 +50,7 @@ systemctl enable -q --now tautulli
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 2
install/tdarr-install.sh

@@ -17,7 +17,6 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
-$STD apt-get install -y unzip
 msg_ok "Installed Dependencies"
 
 if [[ "$CTTYPE" == "0" ]]; then
@@ -90,7 +89,7 @@ systemctl enable --now -q tdarr-node.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm -rf Tdarr_Updater.zip

+ 1 - 1
install/technitiumdns-install.sh

@@ -35,7 +35,7 @@ $STD bash <(curl -fsSL https://download.technitium.com/dns/install.sh)
 msg_ok "Installed Technitium DNS"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/transmission-install.sh

@@ -28,7 +28,7 @@ systemctl start transmission-daemon
 msg_ok "Installed Transmission"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/trilium-install.sh

@@ -50,7 +50,7 @@ systemctl enable --now -q trilium
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/ubuntu-install.sh

@@ -20,7 +20,7 @@ $STD apt-get install -y mc
 msg_ok "Installed Dependencies"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/umbrel-install.sh

@@ -38,7 +38,7 @@ $STD systemctl enable --now umbrel-startup.service
 msg_ok "Installed Umbrel"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/unifi-install.sh

@@ -38,7 +38,7 @@ $STD apt-get install -y unifi
 msg_ok "Installed UniFi Network Application"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm -rf mongodb-org-server_3.6.23_amd64.deb

+ 1 - 1
install/uptimekuma-install.sh

@@ -53,7 +53,7 @@ $STD systemctl enable --now uptime-kuma.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/vaultwarden-install.sh

@@ -111,7 +111,7 @@ $STD systemctl enable --now vaultwarden.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/whisparr-install.sh

@@ -49,7 +49,7 @@ systemctl enable --now -q whisparr
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm -rf Whisparr.develop.*.tar.gz

+ 1 - 1
install/whoogle-install.sh

@@ -42,7 +42,7 @@ $STD systemctl enable --now whoogle.service
 msg_ok "Installed Whoogle"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/wikijs-install.sh

@@ -70,7 +70,7 @@ $STD systemctl enable --now wikijs
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/wireguard-install.sh

@@ -41,7 +41,7 @@ $STD bash <(curl -fsSL https://install.pivpn.io) --unattended options.conf
 msg_ok "Installed WireGuard"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/yunohost-install.sh

@@ -30,7 +30,7 @@ $STD bash <(curl -fsSL https://install.yunohost.org) -a
 msg_ok "Installed YunoHost"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 1
install/zigbee2mqtt-install.sh

@@ -69,7 +69,7 @@ $STD systemctl enable zigbee2mqtt.service
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 $STD apt-get autoremove

+ 1 - 2
install/zwave-js-ui-install.sh

@@ -17,7 +17,6 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
-$STD apt-get install -y unzip
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Z-Wave JS UI"
@@ -45,7 +44,7 @@ $STD systemctl enable zwave-js-ui
 msg_ok "Created Service"
 
 motd_ssh
-root
+customize
 
 msg_info "Cleaning up"
 rm zwave-js-ui-${RELEASE}-linux.zip

+ 2 - 6
misc/alpine-install.func

@@ -117,13 +117,9 @@ motd_ssh() {
 }
 
 customize() {
+  if [[ "$PASSWORD" == "" ]]; then
   msg_info "Customizing Container"
   bash -c "passwd -d root" >/dev/null 2>&1
   msg_ok "Customized Container"
-}
-
-root() {
-  if ! getent shadow root | grep -q '^root:[^:]*:\?\$'; then
-    customize
   fi
-}
+}

+ 1 - 1
misc/build.func

@@ -169,7 +169,7 @@ advanced_settings() {
   if PW1=$(whiptail --inputbox "\nSet Root Password (needed for root ssh access)" 9 58 --title "PASSWORD(leave blank for automatic login)" 3>&1 1>&2 2>&3); then
     if [ -z $PW1 ]; then
       PW1="Automatic Login"
-      PW=" "
+      PW=""
     else
       PW="-password $PW1"
     fi

+ 2 - 6
misc/install.func

@@ -116,6 +116,7 @@ motd_ssh() {
 }
 
 customize() {
+  if [[ "$PASSWORD" == "" ]]; then
   msg_info "Customizing Container"
   GETTY_OVERRIDE="/etc/systemd/system/container-getty@1.service.d/override.conf"
   mkdir -p $(dirname $GETTY_OVERRIDE)
@@ -127,10 +128,5 @@ EOF
   systemctl daemon-reload
   systemctl restart $(basename $(dirname $GETTY_OVERRIDE) | sed 's/\.d//')
   msg_ok "Customized Container"
-}
-
-root() {
-  if ! getent shadow root | grep -q "^root:[^\!*]"; then
-    customize
   fi
-}
+}