diff --git a/files/initrd/opt/rr/include/addons.sh b/files/initrd/opt/rr/include/addons.sh index 5d753f8a..dc9fa6f0 100755 --- a/files/initrd/opt/rr/include/addons.sh +++ b/files/initrd/opt/rr/include/addons.sh @@ -29,7 +29,7 @@ function availableAddons() { [ -z "${DESC}" ] && DESC="$(readConfigKey "description.en_US" "${D}/manifest.yml")" [ -z "${DESC}" ] && DESC="$(readConfigKey "description" "${D}/manifest.yml")" - DESC="$(echo "${DESC}" | sed -E 's/["\n]/ /g' | xargs)" + DESC="$(echo "${DESC}" | tr -d '\n\r\t\\' | sed "s/\"/'/g")" echo "${ADDON} \"${DESC:-"unknown"}\"" done <<<"$(find "${ADDONS_PATH}" -maxdepth 1 -type d 2>/dev/null | sort)" } diff --git a/files/initrd/opt/rr/include/modules.sh b/files/initrd/opt/rr/include/modules.sh index 7c1fb439..f2f80b9b 100755 --- a/files/initrd/opt/rr/include/modules.sh +++ b/files/initrd/opt/rr/include/modules.sh @@ -61,7 +61,7 @@ function getAllModules() { local N DESC N="$(basename "${F}" .ko)" DESC="$(modinfo -F description "${F}" 2>/dev/null)" - DESC="$(echo "${DESC}" | sed -E 's/["\n]/ /g' | xargs)" + DESC="$(echo "${DESC}" | tr -d '\n\r\t\\' | sed "s/\"/'/g")" echo "${N} \"${DESC:-${N}}\"" done diff --git a/files/initrd/opt/rr/menu.sh b/files/initrd/opt/rr/menu.sh index e8740037..c3940e30 100755 --- a/files/initrd/opt/rr/menu.sh +++ b/files/initrd/opt/rr/menu.sh @@ -645,7 +645,7 @@ function addonMenu() { continue fi DIALOG --title "$(TEXT "Addons")" \ - --menu "$(TEXT "Select an addon")" 0 0 20 --file "${TMP_PATH}/menu" \ + --menu "$(TEXT "Select an addon")" 0 0 25 --file "${TMP_PATH}/menu" \ 2>"${TMP_PATH}/resp" [ $? -ne 0 ] && continue resp="$(cat "${TMP_PATH}/resp" 2>/dev/null)"