Update homeassistant-core-install.sh

cleanup

install/homeassistant-core-install.sh

@@ -13,8 +13,7 @@ setting_up_container
 network_check
 update_os
 
-if [[ "$PCT_OSVERSION" == "12" ]]; then
+  msg_info "Installing Dependencies, (Patience)"
-  msg_info "Installing Dependencies, Bookworm (Patience)"
   $STD apt-get install -y \
     git \
     curl \
@@ -33,48 +32,30 @@ if [[ "$PCT_OSVERSION" == "12" ]]; then
     build-essential \
     libopenjp2-7 \
     libturbojpeg0-dev \
-    tzdata \
     ffmpeg \
     liblapack3 \
     liblapack-dev \
+    dbus-broker \
+    libpcap-dev \
+    libmariadb-dev-compat \
     libatlas-base-dev
   msg_ok "Installed Dependencies"
-else
+
-  msg_info "Installing Dependencies, Bullseye (Patience)"
+if [[ "$PCT_OSVERSION" == "11" ]]; then
+  msg_info "Installing pyenv"
   $STD apt-get install -y \
-    git \
+    make \
-    curl \
-    sudo \
-    mc \
-    build-essential \
-    libssl-dev \
-    zlib1g-dev \
-    libbz2-dev \
-    libpcap-dev \
     libreadline-dev \
     libsqlite3-dev \
+    libncurses5-dev \
     libncursesw5-dev \
     xz-utils \
     tk-dev \
     llvm \
+    libbz2-dev \
     libxml2-dev \
     libxmlsec1-dev \
-    libffi-dev \
+    liblzma-dev
-    liblzma-dev \
-    dbus-broker \
-    bluez \
-    libmariadb-dev-compat \
-    libjpeg-dev \
-    autoconf \
-    libopenjp2-7 \
-    libtiff5 \
-    libturbojpeg0-dev \
-    liblapack3 \
-    liblapack-dev \
-    libatlas-base-dev
-  msg_ok "Installed Dependencies"
-
-  msg_info "Installing pyenv"
   $STD git clone https://github.com/pyenv/pyenv.git ~/.pyenv
   set +e
   echo 'export PYENV_ROOT="$HOME/.pyenv"' >>~/.bashrc
@@ -82,6 +63,7 @@ else
   echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n eval "$(pyenv init --path)"\nfi' >>~/.bashrc
   msg_ok "Installed pyenv"
   . ~/.bashrc
+  
   set -e
   msg_info "Installing Python 3.11.3 (Patience)"
   $STD pyenv install 3.11.3
@@ -97,6 +79,8 @@ source bin/activate
 $STD pip install --upgrade pip
 $STD python3 -m pip install wheel
 $STD pip install homeassistant
+$STD pip install mysqlclient
+$STD pip install psycopg2-binary
 mkdir -p /root/.homeassistant
 msg_ok "Installed Home Assistant-Core"
 

install/nginxproxymanager-install.sh

@@ -21,41 +21,41 @@ $STD apt-get -y install \
   curl \
   gnupg \
   make \
-  g++ \
   gcc \
+  g++ \
   ca-certificates \
   apache2-utils \
   logrotate \
   build-essential \
-  python3-dev \
+  git
-  git \
-  lsb-release
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Python"
-$STD apt-get install -y -q --no-install-recommends python3 python3-pip python3-venv
+$STD apt-get install -y \
-$STD pip3 install --upgrade setuptools
+python3 \
-$STD pip3 install --upgrade pip
+python3-dev \
+python3-pip \
+python3-venv \
+python3-cffi \
+python3-certbot \
+python3-certbot-dns-cloudflare
 $STD python3 -m venv /opt/certbot/
-if [ "$(getconf LONG_BIT)" = "32" ]; then
-  $STD python3 -m pip install --no-cache-dir -U cryptography==3.3.2
-fi
-$STD python3 -m pip install --no-cache-dir cffi certbot certbot-dns-cloudflare
 msg_ok "Installed Python"
 
+VERSION="$( awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release )"
+
 msg_info "Installing Openresty"
-$STD apt-key add <(curl -fsSL https://openresty.org/package/pubkey.gpg)
+wget -qO - https://openresty.org/package/pubkey.gpg | gpg --dearmor -o /etc/apt/trusted.gpg.d/openresty-archive-keyring.gpg
-sh -c 'echo "deb http://openresty.org/package/debian $(lsb_release -cs) openresty" > /etc/apt/sources.list.d/openresty.list'
+echo -e "deb http://openresty.org/package/debian bullseye openresty" >/etc/apt/sources.list.d/openresty.list
-$STD apt-get -y update
+$STD apt-get update
-$STD apt-get -y install --no-install-recommends openresty
+$STD apt-get -y install openresty
 msg_ok "Installed Openresty"
 
-msg_info "Setting up Node.js Repository"
-$STD bash <(curl -fsSL https://deb.nodesource.com/setup_16.x)
-msg_ok "Set up Node.js Repository"
-
 msg_info "Installing Node.js"
-$STD apt-get install -y nodejs
+$STD bash <(curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.38.0/install.sh)
+source ~/.bashrc
+$STD nvm install 16
+ln -sf /root/.nvm/versions/node/v16.20.0/bin/node /usr/bin/node
 msg_ok "Installed Node.js"
 
 msg_info "Installing Yarn"
@@ -117,7 +117,6 @@ chown root /tmp/nginx
 echo resolver "$(awk 'BEGIN{ORS=" "} $1=="nameserver" {print ($2 ~ ":")? "["$2"]": $2}' /etc/resolv.conf);" >/etc/nginx/conf.d/include/resolvers.conf
 
 if [ ! -f /data/nginx/dummycert.pem ] || [ ! -f /data/nginx/dummykey.pem ]; then
-  echo -en "${GN} Generating dummy SSL Certificate... "
   openssl req -new -newkey rsa:2048 -days 3650 -nodes -x509 -subj "/O=Nginx Proxy Manager/OU=Dummy Certificate/CN=localhost" -keyout /data/nginx/dummykey.pem -out /data/nginx/dummycert.pem &>/dev/null
 fi