Merge remote-tracking branch 'upstream/main'

CHANGELOG.md

@@ -10,6 +10,13 @@
 - All LXC instances created using this repository come pre-installed with Midnight Commander, which is a command-line tool (`mc`) that offers a user-friendly file and directory management interface for the terminal environment.
 - 🚨 **The scripts in the repository will no longer provide support for Proxmox VE 7 starting from July 2024 (scripts will not execute on PVE7). Subsequent <a href='https://forum.proxmox.com/threads/proxmox-ve-support-lifecycle.35755/' target='_blank' rel='noopener noreferrer'>Proxmox VE - Support Lifecycle</a>**
 
+## 2024-05-31
+
+### Changed
+
+- **Advanced Settings**
+  - Passwords are now masked
+
 ## 2024-05-30
 
 ### Changed

ct/dashy.sh

@@ -75,10 +75,9 @@ if [[ "${RELEASE}" != "$(cat /opt/${APP}_version.txt)" ]] || [[ ! -f /opt/${APP}
   rm -rf /opt/dashy
   mkdir -p /opt/dashy
   wget -qO- https://github.com/Lissy93/dashy/archive/refs/tags/${RELEASE}.tar.gz | tar -xz -C /opt/dashy --strip-components=1
-  sed -i 's/NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build/NODE_OPTIONS=yarn vue-cli-service build/' /opt/dashy/package.json
   cd /opt/dashy
-  yarn &>/dev/null
-  yarn build &>/dev/null
+  npm install &>/dev/null
+  npm run build &>/dev/null
   echo "${RELEASE}" >/opt/${APP}_version.txt
   msg_ok "Updated ${APP} to ${RELEASE}"
 

install/dashy-install.sh

@@ -18,30 +18,27 @@ $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
 $STD apt-get install -y wget
+$STD apt-get install -y gpg
 msg_ok "Installed Dependencies"
 
-msg_info "Installing Node.js (Patience)"
-$STD apt-get install -y npm
-$STD npm cache clean -f
-$STD npm install -g n
-$STD n 16.20.1
-$STD npm install -g pnpm
-ln -sf /usr/local/bin/node /usr/bin/node
-msg_ok "Installed Node.js"
+msg_info "Setting up Node.js Repository"
+mkdir -p /etc/apt/keyrings
+curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
+echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" >/etc/apt/sources.list.d/nodesource.list
+msg_ok "Set up Node.js Repository"
 
-msg_info "Installing Yarn"
-$STD npm install -g yarn
-ln -sf /usr/local/bin/yarn /usr/bin/yarn
-msg_ok "Installed Yarn"
+msg_info "Installing Node.js"
+$STD apt-get update
+$STD apt-get install -y nodejs
+msg_ok "Installed Node.js"
 
 RELEASE=$(curl -s https://api.github.com/repos/Lissy93/dashy/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
 msg_info "Installing Dashy ${RELEASE} (Patience)"
 mkdir -p /opt/dashy
 wget -qO- https://github.com/Lissy93/dashy/archive/refs/tags/${RELEASE}.tar.gz | tar -xz -C /opt/dashy --strip-components=1
 cd /opt/dashy
-sed -i 's/NODE_OPTIONS=--openssl-legacy-provider vue-cli-service build/NODE_OPTIONS=yarn vue-cli-service build/' /opt/dashy/package.json
-$STD yarn
-$STD yarn build
+$STD npm install
+$STD npm run build
 echo "${RELEASE}" >/opt/${APPLICATION}_version.txt
 msg_ok "Installed Dashy ${RELEASE}"
 
@@ -53,7 +50,7 @@ Description=dashy
 [Service]
 Type=simple
 WorkingDirectory=/opt/dashy
-ExecStart=/usr/bin/yarn start
+ExecStart=/usr/bin/npm start
 [Install]
 WantedBy=multi-user.target
 EOF

misc/build.func

@@ -221,16 +221,24 @@ advanced_settings() {
   done
 
   while true; do
-    if PW1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --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 PW1=$(whiptail --backtitle "Proxmox VE Helper Scripts" --passwordbox "\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
         if [[ "$PW1" == *" "* ]]; then
           whiptail --msgbox "Password cannot contain spaces. Please try again." 8 58
         elif [ ${#PW1} -lt 5 ]; then
           whiptail --msgbox "Password must be at least 5 characters long. Please try again." 8 58
         else
-          PW="-password $PW1"
-          echo -e "${DGN}Using Root Password: ${BGN}$PW1${CL}"
-          break
+          if PW2=$(whiptail --backtitle "Proxmox VE Helper Scripts" --passwordbox "\nVerify Root Password" 9 58 --title "PASSWORD VERIFICATION" 3>&1 1>&2 2>&3); then
+            if [[ "$PW1" == "$PW2" ]]; then
+              PW="-password $PW1"
+              echo -e "${DGN}Using Root Password: ${BGN}********${CL}"
+              break
+            else
+              whiptail --msgbox "Passwords do not match. Please try again." 8 58
+            fi
+          else
+            exit-script
+          fi
         fi
       else
         PW1="Automatic Login"