Fix addon menu display and message formatting

files/initrd/opt/rr/include/addons.sh

@@ -28,9 +28,9 @@ function availableAddons() {
     [ -z "${DESC}" ] && DESC="$(readConfigKey "description.${LOCALE:-"en_US"}" "${D}/manifest.yml")"
     [ -z "${DESC}" ] && DESC="$(readConfigKey "description.en_US" "${D}/manifest.yml")"
     [ -z "${DESC}" ] && DESC="$(readConfigKey "description" "${D}/manifest.yml")"
-    [ -z "${DESC}" ] && DESC="unknown"
 
-    echo -e "${ADDON}\t$(echo "${DESC}" | sed -E 's/["\n]/ /g')"
+    DESC="$(echo "${DESC}" | sed -E 's/["\n]/ /g' | xargs)"
+    echo "${ADDON} \"${DESC:-"unknown"}\""
   done <<<"$(find "${ADDONS_PATH}" -maxdepth 1 -type d 2>/dev/null | sort)"
 }
 

files/initrd/opt/rr/include/modules.sh

@@ -58,12 +58,11 @@ function getAllModules() {
 
   for F in ${TMP_PATH}/modules/*.ko; do
     [ ! -e "${F}" ] && continue
-    local X M DESC
+    local N DESC
-    X=$(basename "${F}")
+    N="$(basename "${F}" .ko)"
-    M=$(basename "${F}" .ko)
+    DESC="$(modinfo -F description "${F}" 2>/dev/null)"
-    DESC=$(modinfo "${F}" 2>/dev/null | awk -F':' '/description:/{ print $2}' | awk '{sub(/^[ ]+/,""); print}')
+    DESC="$(echo "${DESC}" | sed -E 's/["\n]/ /g' | xargs)"
-    [ -z "${DESC}" ] && DESC="${X}"
+    echo "${N} \"${DESC:-${N}}\""
-    echo "${M} \"${DESC}\""
   done
 
   rm -rf "${TMP_PATH}/modules"
@@ -168,7 +167,7 @@ function getdepends() {
   function _getdepends() {
     if [ -f "${TMP_PATH}/modules/${1}.ko" ]; then
       local depends
-      depends="$(modinfo "${TMP_PATH}/modules/${1}.ko" 2>/dev/null | grep depends: | awk -F: '{print $2}' | awk '$1=$1' | sed 's/,/\n/g')"
+      depends="$(modinfo -F depends "${TMP_PATH}/modules/${1}.ko" 2>/dev/null | sed 's/,/\n/g')"
       if [ "$(echo "${depends}" | wc -w)" -gt 0 ]; then
         for k in ${depends}; do
           echo "${k}"

files/initrd/opt/rr/menu.sh

@@ -636,7 +636,7 @@ function addonMenu() {
       rm -f "${TMP_PATH}/menu"
       while read -r ADDON DESC; do
         arrayExistItem "${ADDON}" "${!ADDONS[@]}" && continue # Check if addon has already been added
-        echo "${ADDON} \"${DESC}\"" >>"${TMP_PATH}/menu"
+        echo "${ADDON} ${DESC}" >>"${TMP_PATH}/menu"
       done <<<"$(availableAddons "${PLATFORM}" "${KPRE:+${KPRE}-}${KVER}")"
       if [ ! -f "${TMP_PATH}/menu" ]; then
         DIALOG --title "$(TEXT "Addons")" \
@@ -690,15 +690,14 @@ function addonMenu() {
       touch "${PART1_PATH}/.build"
       ;;
     s)
-      MSG="$(TEXT "Name with color \"\Z4blue\Zn\" have been added, with color \"black\" are not added.\n")"
+      MSG="$(TEXT "Name with color \"\Z4blue\Zn\" have been added, with color \"\Z1red\Zn\" are not added.\n")"
       MSG+="\n"
-      while read -r MODULE DESC; do
+      while read -r ADDON DESC; do
-        if arrayExistItem "${MODULE}" "${!ADDONS[@]}"; then
+        if arrayExistItem "${ADDON}" "${!ADDONS[@]}"; then
-          MSG+="\Z4${MODULE}\Zn"
+          MSG+="\Z4${ADDON}:\Zn \Z5${DESC}\Zn\n"
         else
-          MSG+="${MODULE}"
+          MSG+="\Z1${ADDON}:\Z1 \Z5${DESC}\Zn\n"
         fi
-        MSG+=": \Z5${DESC}\Zn\n"
       done <<<"$(availableAddons "${PLATFORM}" "${KPRE:+${KPRE}-}${KVER}")"
       DIALOG --title "$(TEXT "Addons")" \
         --msgbox "${MSG}" 0 0