From 64bdc91b677b1e7f36657d4dee5898b0a4a76de0 Mon Sep 17 00:00:00 2001
From: tteckster <tteckster@gmail.com>
Date: Thu, 14 Sep 2023 12:16:26 -0400
Subject: [PATCH] Update microcode.sh

code refactoring
---
 misc/microcode.sh | 121 +++++++++++++++++++++++++---------------------
 1 file changed, 65 insertions(+), 56 deletions(-)

diff --git a/misc/microcode.sh b/misc/microcode.sh
index 6b3bb5fc..7900bacd 100644
--- a/misc/microcode.sh
+++ b/misc/microcode.sh
@@ -5,8 +5,8 @@
 # https://github.com/tteck/Proxmox/raw/main/LICENSE
 
 function header_info {
-clear
-cat <<"EOF"
+  clear
+  cat <<"EOF"
     ____                                               __  ____                                __
    / __ \_________  ________  ______________  _____   /  |/  (_)_____________  _________  ____/ /__
   / /_/ / ___/ __ \/ ___/ _ \/ ___/ ___/ __ \/ ___/  / /|_/ / / ___/ ___/ __ \/ ___/ __ \/ __  / _ \
@@ -25,90 +25,99 @@ HOLD="-"
 CM="${GN}✓${CL}"
 CROSS="${RD}✗${CL}"
 
-msg_info() {
-  local msg="$1"
-  echo -ne " ${HOLD} ${YW}${msg}..."
-}
-
-msg_ok() {
-  local msg="$1"
-  echo -e "${BFR} ${CM} ${GN}${msg}${CL}"
-}
-
-msg_error() {
-  local msg="$1"
-  echo -e "${BFR} ${CROSS} ${RD}${msg}${CL}"
-}
+msg_info() { echo -ne " ${HOLD} ${YW}$1..."; }
+msg_ok() { echo -e "${BFR} ${CM} ${GN}$1${CL}"; }
+msg_error() { echo -e "${BFR} ${CROSS} ${RD}$1${CL}"; }
 
 header_info
-current_microcode=$(dmesg | grep -o 'microcode updated early to revision [^,]*, date = [0-9\-]*')
-while true; do
-  if [ -z "${current_microcode}" ]; then
-    msg_error "Microcode update information not found."
-  else
-    msg_ok "Current ${current_microcode}"
-  fi
-  read -p "Install the latest Processor Microcode (y/n)?" yn
-  case $yn in
-  [Yy]*) break ;;
-  [Nn]*) exit ;;
-  *) echo "Please answer yes or no." ;;
-  esac
-done
-header_info
+current_microcode=$(journalctl -k | grep -E "microcode: microcode" | awk -F 'microcode: microcode updated early to revision |, date = ' '{print $2 ", date = " $3}')
+[ -z "$current_microcode" ] && current_microcode="Not found."
 
 intel() {
   if ! dpkg -s iucode-tool >/dev/null 2>&1; then
-    msg_info "Installing iucode-tool: a tool for updating Intel processor microcode"
+    msg_info "Installing iucode-tool (Intel microcode updater)"
     apt-get install -y iucode-tool &>/dev/null
     msg_ok "Installed iucode-tool"
   else
     msg_ok "Intel iucode-tool is already installed"
+    sleep 1
   fi
-  
-  msg_info "Downloading the latest Intel Processor Microcode Package for Linux"
-  wget -q http://ftp.debian.org/debian/pool/non-free-firmware/i/intel-microcode/intel-microcode_3.20230808.1_amd64.deb
-  msg_ok "Downloaded the latest Intel Processor Microcode Package"
 
-  msg_info "Installing the Intel Processor Microcode (Patience)"
-  dpkg -i intel-microcode_3.20230808.1_amd64.deb &>/dev/null
-  msg_ok "Installed the Intel Processor Microcode"
+  intel_microcode=$(curl -fsSL "https://ftp.debian.org/debian/pool/non-free-firmware/i/intel-microcode//" | grep -o 'href="[^"]*amd64.deb"' | sed 's/href="//;s/"//')
+  [ -z "$intel_microcode" ] && { whiptail --backtitle "Proxmox VE Helper Scripts" --title "No Microcode Found" --msgbox "It appears there were no microcode packages found\n Try again later." 10 68; msg_info "Exiting"; sleep 1; msg_ok "Done"; exit; }
+
+  CTID_MENU=()
+  MSG_MAX_LENGTH=0
+
+  while read -r TAG ITEM; do
+    OFFSET=2
+    (( ${#ITEM} + OFFSET > MSG_MAX_LENGTH )) && MSG_MAX_LENGTH=${#ITEM}+OFFSET
+    CTID_MENU+=("$TAG" "$ITEM " "OFF")
+  done < <(echo "$intel_microcode")
+
+  microcode=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Current Microcode revision:${current_microcode}" --radiolist "\nSelect a microcode package to install:\n" 16 $((MSG_MAX_LENGTH + 58)) 6 "${CTID_MENU[@]}" 3>&1 1>&2 2>&3 | tr -d '"') || exit
+
+  [ -z "$microcode" ] && { whiptail --backtitle "Proxmox VE Helper Scripts" --title "No Microcode Selected" --msgbox "It appears that no microcode packages were selected" 10 68; msg_info "Exiting"; sleep 1; msg_ok "Done"; exit; }
+
+  msg_info "Downloading the Intel Processor Microcode Package $microcode"
+  wget -q http://ftp.debian.org/debian/pool/non-free-firmware/i/intel-microcode/$microcode
+  msg_ok "Downloaded the Intel Processor Microcode Package $microcode"
+
+  msg_info "Installing $microcode (Patience)"
+  dpkg -i $microcode &>/dev/null
+  msg_ok "Installed $microcode"
 
   msg_info "Cleaning up"
-  rm intel-microcode_3.20230808.1_amd64.deb
+  rm $microcode
   msg_ok "Cleaned"
-  
-  echo -e "\n To apply the changes, the system will need to be rebooted.\n"
+  echo -e "\nIn order to apply the changes, a system reboot will be necessary.\n"
 }
 
 amd() {
-  msg_info "Downloading the latest AMD Processor Microcode Package for Linux"
-  wget -q http://ftp.debian.org/debian/pool/non-free-firmware/a/amd64-microcode/amd64-microcode_3.20230808.1.1_amd64.deb
-  msg_ok "Downloaded the latest AMD Processor Microcode Package"
+  amd_microcode=$(curl -fsSL "https://ftp.debian.org/debian/pool/non-free-firmware/a/amd64-microcode///" | grep -o 'href="[^"]*amd64.deb"' | sed 's/href="//;s/"//')
 
-  msg_info "Installing the AMD Processor Microcode (Patience)"
-  dpkg -i amd64-microcode_3.20230808.1.1_amd64.deb &>/dev/null
-  msg_ok "Installed the AMD Processor Microcode"
+  [ -z "$amd_microcode" ] && { whiptail --backtitle "Proxmox VE Helper Scripts" --title "No Microcode Found" --msgbox "It appears there were no microcode packages found\n Try again later." 10 68; msg_info "Exiting"; sleep 1; msg_ok "Done"; exit; }
+
+  CTID_MENU=()
+  MSG_MAX_LENGTH=0
+
+  while read -r TAG ITEM; do
+    OFFSET=2
+    (( ${#ITEM} + OFFSET > MSG_MAX_LENGTH )) && MSG_MAX_LENGTH=${#ITEM}+OFFSET
+    CTID_MENU+=("$TAG" "$ITEM " "OFF")
+  done < <(echo "$amd_microcode")
+
+  microcode=$(whiptail --backtitle "Proxmox VE Helper Scripts" --title "Current Microcode revision:${current_microcode}" --radiolist "\nSelect a microcode package to install:\n" 16 $((MSG_MAX_LENGTH + 58)) 6 "${CTID_MENU[@]}" 3>&1 1>&2 2>&3 | tr -d '"') || exit
+
+  [ -z "$microcode" ] && { whiptail --backtitle "Proxmox VE Helper Scripts" --title "No Microcode Selected" --msgbox "It appears that no microcode packages were selected" 10 68; msg_info "Exiting"; sleep 1; msg_ok "Done"; exit; }
+
+  msg_info "Downloading the AMD Processor Microcode Package $microcode"
+  wget -q https://ftp.debian.org/debian/pool/non-free-firmware/a/amd64-microcode/$microcode
+  msg_ok "Downloaded the AMD Processor Microcode Package $microcode"
+
+  msg_info "Installing $microcode (Patience)"
+  dpkg -i $microcode &>/dev/null
+  msg_ok "Installed $microcode"
 
   msg_info "Cleaning up"
-  rm amd64-microcode_3.20230808.1.1_amd64.deb
+  rm $microcode
   msg_ok "Cleaned"
-  
-  echo -e "\n To apply the changes, the system will need to be rebooted.\n"
+  echo -e "\nIn order to apply the changes, a system reboot will be necessary.\n"
 }
 
-if ! command -v pveversion >/dev/null 2>&1; then
-  header_info
-  msg_error "\n No PVE Detected!\n"
-  exit
-fi
+if ! command -v pveversion >/dev/null 2>&1; then header_info; msg_error "No PVE Detected!"; exit; fi
+
+whiptail --backtitle "Proxmox VE Helper Scripts" --title "Proxmox VE Processor Microcode" --yesno "This will check for CPU microcode packages with the option to install. Proceed?" 10 58 || exit
+
 msg_info "Checking CPU Vendor"
 cpu=$(lscpu | grep -oP 'Vendor ID:\s*\K\S+' | head -n 1)
 if [ "$cpu" == "GenuineIntel" ]; then
   msg_ok "${cpu} was detected"
+  sleep 1
   intel
 elif [ "$cpu" == "AuthenticAMD" ]; then
   msg_ok "${cpu} was detected"
+  sleep 1
   amd
 else
   msg_error "${cpu} is not supported"