From 5ff537fb6ac37509364f23928857372b23e27f3e Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Tue, 26 Mar 2024 20:20:18 +0100 Subject: [PATCH] tree: fix syntax Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc-functions.sh | 26 ++++++++++++------------- files/initrd/opt/arc/arc.sh | 14 ++++++------- files/initrd/opt/arc/include/storage.sh | 6 +++--- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh index 3499be00..4ff7a083 100755 --- a/files/initrd/opt/arc/arc-functions.sh +++ b/files/initrd/opt/arc/arc-functions.sh @@ -49,13 +49,13 @@ function addonSelection() { declare -A ADDONS while IFS=': ' read -r KEY VALUE; do [ -n "${KEY}" ] && ADDONS["${KEY}"]="${VALUE}" - done <<<(readConfigMap "addons" "${USER_CONFIG_FILE}") + done <<<$(readConfigMap "addons" "${USER_CONFIG_FILE}") rm -f "${TMP_PATH}/opts" touch "${TMP_PATH}/opts" while read -r ADDON DESC; do arrayExistItem "${ADDON}" "${!ADDONS[@]}" && ACT="on" || ACT="off" echo -e "${ADDON} \"${DESC}\" ${ACT}" >>"${TMP_PATH}/opts" - done <<<(availableAddons "${PLATFORM}" "${KVER}") + done <<<$(availableAddons "${PLATFORM}" "${KVER}") dialog --backtitle "$(backtitle)" --title "Loader Addons" --aspect 18 \ --checklist "Select Loader Addons to include.\nPlease read Wiki before choosing anything.\nSelect with SPACE, Confirm with ENTER!" 0 0 0 \ --file "${TMP_PATH}/opts" 2>"${TMP_PATH}/resp" @@ -89,7 +89,7 @@ function modulesMenu() { declare -A USERMODULES while IFS=': ' read -r KEY VALUE; do [ -n "${KEY}" ] && USERMODULES["${KEY}"]="${VALUE}" - done <<<(readConfigMap "modules" "${USER_CONFIG_FILE}") + done <<<$(readConfigMap "modules" "${USER_CONFIG_FILE}") # menu loop while true; do dialog --backtitle "$(backtitle)" --menu "Choose an Option" 0 0 0 \ @@ -137,7 +137,7 @@ function modulesMenu() { while read -r ID DESC; do USERMODULES["${ID}"]="" writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}" - done <<<(getAllModules "${PLATFORM}" "${KVER}") + done <<<$(getAllModules "${PLATFORM}" "${KVER}") writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" ;; @@ -155,7 +155,7 @@ function modulesMenu() { while read -r ID DESC; do arrayExistItem "${ID}" "${!USERMODULES[@]}" && ACT="on" || ACT="off" echo "${ID} ${DESC} ${ACT}" >>"${TMP_PATH}/opts" - done <<<(getAllModules "${PLATFORM}" "${KVER}") + done <<<$(getAllModules "${PLATFORM}" "${KVER}") dialog --backtitle "$(backtitle)" --title "Modules" --aspect 18 \ --checklist "Select Modules to include" 0 0 0 \ --file "${TMP_PATH}/opts" 2>"${TMP_PATH}/resp" @@ -219,7 +219,7 @@ function cmdlineMenu() { declare -A CMDLINE while IFS=': ' read -r KEY VALUE; do [ -n "${KEY}" ] && CMDLINE["${KEY}"]="${VALUE}" - done <<<(readConfigMap "cmdline" "${USER_CONFIG_FILE}") + done <<<$(readConfigMap "cmdline" "${USER_CONFIG_FILE}") echo "1 \"Add a Cmdline item\"" >"${TMP_PATH}/menu" echo "2 \"Delete Cmdline item(s)\"" >>"${TMP_PATH}/menu" echo "3 \"CPU Fix\"" >>"${TMP_PATH}/menu" @@ -391,7 +391,7 @@ function cmdlineMenu() { ITEMS="" while IFS=': ' read -r KEY VALUE; do ITEMS+="${KEY}: ${VALUE}\n" - done <<<(readModelMap "${MODEL}" "productvers.[${PRODUCTVER}].cmdline") + done <<<$(readModelMap "${MODEL}" "productvers.[${PRODUCTVER}].cmdline") dialog --backtitle "$(backtitle)" --title "Model/Version cmdline" \ --aspect 18 --msgbox "${ITEMS}" 0 0 ;; @@ -421,7 +421,7 @@ function synoinfoMenu() { declare -A SYNOINFO while IFS=': ' read -r KEY VALUE; do [ -n "${KEY}" ] && SYNOINFO["${KEY}"]="${VALUE}" - done <<<(readConfigMap "synoinfo" "${USER_CONFIG_FILE}") + done <<<$(readConfigMap "synoinfo" "${USER_CONFIG_FILE}") echo "1 \"Add/edit Synoinfo item\"" >"${TMP_PATH}/menu" echo "2 \"Delete Synoinfo item(s)\"" >>"${TMP_PATH}/menu" @@ -568,7 +568,7 @@ function keymapMenu() { OPTIONS="" while read -r KM; do OPTIONS+="${KM::-7} " - done <<<(cd /usr/share/keymaps/i386/${LAYOUT}; ls *.map.gz) + done <<<$(cd /usr/share/keymaps/i386/${LAYOUT}; ls *.map.gz) dialog --backtitle "$(backtitle)" --no-items --default-item "${KEYMAP}" \ --menu "Choice a keymap" 0 0 0 ${OPTIONS} \ 2>"${TMP_PATH}/resp" @@ -693,7 +693,7 @@ function backupMenu() { [ "${unique}" = "${UNIQUE}" ] || continue # Found writeConfigKey "model" "${M}" "${USER_CONFIG_FILE}" - done <<<(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort) + done <<<$(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort) MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" if [ -n "${MODEL}" ]; then writeConfigKey "productver" "${majorversion}.${minorversion}" "${USER_CONFIG_FILE}" @@ -796,7 +796,7 @@ function backupMenu() { [ "${unique}" = "${UNIQUE}" ] || continue # Found writeConfigKey "model" "${M}" "${USER_CONFIG_FILE}" - done <<<(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort) + done <<<$(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sort) MODEL="$(readConfigKey "model" "${USER_CONFIG_FILE}")" if [ -n "${MODEL}" ]; then writeConfigKey "productver" "${majorversion}.${minorversion}" "${USER_CONFIG_FILE}" @@ -1083,7 +1083,7 @@ function updateMenu() { writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" while read -r ID DESC; do writeConfigKey "modules.${ID}" "" "${USER_CONFIG_FILE}" - done <<<(getAllModules "${PLATFORM}" "${KVER}") + done <<<$(getAllModules "${PLATFORM}" "${KVER}") fi rm -f "${TMP_PATH}/modules.zip" writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" @@ -1941,7 +1941,7 @@ function formatdisks() { [ -z "${KMODEL}" ] && KMODEL="${TYPE}" echo "${KNAME}" | grep -q "${LOADER_DISK}" && continue echo "\"${KNAME}\" \"${KMODEL}\" \"off\"" >>"${TMP_PATH}/opts" - done <<<(lsblk -pno KNAME,MODEL,TYPE) + done <<<$(lsblk -pno KNAME,MODEL,TYPE) if [ ! -f "${TMP_PATH}/opts" ]; then dialog --backtitle "$(backtitle)" --colors --title "Format Disks" \ --msgbox "No disk found!" 0 0 diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index c0ce8af7..fc23cc28 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -18,7 +18,7 @@ RAMTOTAL=0 while read -r LINE; do RAMSIZE=${LINE} RAMTOTAL=$((${RAMTOTAL} + ${RAMSIZE})) -done <<<(dmidecode -t memory | grep -i "Size" | cut -d" " -f2 | grep -i "[1-9]") +done <<<$(dmidecode -t memory | grep -i "Size" | cut -d" " -f2 | grep -i "[1-9]") RAMTOTAL=$((${RAMTOTAL} * 1024)) [ -z "${RAMTOTAL}" ] || [ ${RAMTOTAL} -le 0 ] && RAMMAX=8192 RAMMAX=$((${RAMTOTAL} * 2)) @@ -122,7 +122,7 @@ function arcModel() { while read -r M; do Y="$(readModelKey "${M}" "disks")" echo "${M} ${Y}" >>"${TMP_PATH}/modellist" - done <<<(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sed 's/.*\///; s/\.yml//') + done <<<$(find "${MODEL_CONFIG_PATH}" -maxdepth 1 -name \*.yml | sed 's/.*\///; s/\.yml//') while true; do echo -n "" >"${TMP_PATH}/menu" @@ -162,7 +162,7 @@ function arcModel() { [ "${DT}" = "true" ] && DTO="DT" || DTO="" [ "${BETA}" = "true" ] && BETA="Beta" || BETA="" [ ${COMPATIBLE} -eq 1 ] && echo "${M} \"$(printf "\Zb%-7s\Zn \Zb%-6s\Zn \Zb%-13s\Zn \Zb%-3s\Zn \Zb%-7s\Zn \Zb%-4s\Zn" "${DISKS}" "${CPU}" "${PLATFORM}" "${DTO}" "${ARCAV}" "${BETA}")\" ">>"${TMP_PATH}/menu" - done <<<(cat "${TMP_PATH}/modellist" | sort -n -k 2) + done <<<$(cat "${TMP_PATH}/modellist" | sort -n -k 2) dialog --backtitle "$(backtitle)" --colors \ --cancel-label "Show all" --help-button --help-label "Exit" \ --extra-button --extra-label "Info" \ @@ -260,12 +260,12 @@ function arcVersion() { writeConfigKey "synoinfo" "{}" "${USER_CONFIG_FILE}" while IFS=': ' read -r KEY VALUE; do writeConfigKey "synoinfo.\"${KEY}\"" "${VALUE}" "${USER_CONFIG_FILE}" - done <<<(readModelMap "${MODEL}" "productvers.[${PRODUCTVER}].synoinfo") + done <<<$(readModelMap "${MODEL}" "productvers.[${PRODUCTVER}].synoinfo") # Reset modules writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" while read -r ID DESC; do writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}" - done <<<(getAllModules "${PLATFORM}" "${KVER}") + done <<<$(getAllModules "${PLATFORM}" "${KVER}") if [ "${ONLYVERSION}" != "true" ]; then arcPatch else @@ -572,7 +572,7 @@ function make() { --msgbox "Addon ${ADDON} not found!" 0 0 return 1 fi - done <<<(readConfigMap "addons" "${USER_CONFIG_FILE}") + done <<<$(readConfigMap "addons" "${USER_CONFIG_FILE}") # Check for offline Mode if [ "${OFFLINE}" = "true" ]; then offlinemake @@ -1022,7 +1022,7 @@ while true; do writeConfigKey "modules" "{}" "${USER_CONFIG_FILE}" while read -r ID DESC; do writeConfigKey "modules.\"${ID}\"" "" "${USER_CONFIG_FILE}" - done <<<(getAllModules "${PLATFORM}" "${KVER}") + done <<<$(getAllModules "${PLATFORM}" "${KVER}") fi writeConfigKey "arc.builddone" "false" "${USER_CONFIG_FILE}" BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" diff --git a/files/initrd/opt/arc/include/storage.sh b/files/initrd/opt/arc/include/storage.sh index 659610f3..b563a969 100755 --- a/files/initrd/opt/arc/include/storage.sh +++ b/files/initrd/opt/arc/include/storage.sh @@ -25,7 +25,7 @@ function getmap() { ATAPORT="$(echo ${LINE} | grep -o 'ata[0-9]*')" PORT=$(echo ${ATAPORT} | sed 's/ata//') HOSTPORTS[${PORT}]=$(echo ${LINE} | grep -o 'host[0-9]*$') - done <<<(ls -l /sys/class/scsi_host | grep -F "${PCI}") + done <<<$(ls -l /sys/class/scsi_host | grep -F "${PCI}") while read -r PORT; do ls -l /sys/block | grep -F -q "${PCI}/ata${PORT}" && ATTACH=1 || ATTACH=0 PCMD=$(cat /sys/class/scsi_host/${HOSTPORTS[${PORT}]}/ahci_port_cmd) @@ -33,7 +33,7 @@ function getmap() { [ ${ATTACH} = 1 ] && CONPORTS=$((${CONPORTS} + 1)) && echo "$((${PORT} - 1))" >>"${TMP_PATH}/ports" [ ${DUMMY} = 1 ] # Do nothing for now NUMPORTS=$((${NUMPORTS} + 1)) - done <<<(echo ${!HOSTPORTS[@]} | tr ' ' '\n' | sort -n) + done <<<$(echo ${!HOSTPORTS[@]} | tr ' ' '\n' | sort -n) [ ${NUMPORTS} -gt 8 ] && NUMPORTS=8 [ ${CONPORTS} -gt 8 ] && CONPORTS=8 echo -n "${NUMPORTS}" >>"${TMP_PATH}/drivesmax" @@ -136,7 +136,7 @@ function getmapSelection() { elif [ ${LINE} = ${LASTDRIVE} ]; then LASTDRIVE=$((${LINE} + 1)) fi - done <<<(cat "${TMP_PATH}/ports") + done <<<$(cat "${TMP_PATH}/ports") # Compute PortMap Options SATAPORTMAPMAX="$(awk '{print $1}' "${TMP_PATH}/drivesmax")" SATAPORTMAP="$(awk '{print $1}' "${TMP_PATH}/drivescon")"