From a4cd47230db7110fc97d5427d0556145dff4a157 Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Sun, 21 Apr 2024 13:53:47 +0200 Subject: [PATCH] ui: change coloring Signed-off-by: AuxXxilium --- files/initrd/opt/arc/arc.sh | 10 +++++----- files/initrd/opt/arc/boot.sh | 14 +++++++------- files/initrd/opt/arc/init.sh | 34 +++++++++++++++++----------------- files/p1/boot/grub/grub.cfg | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index 7c8a900a..29270e84 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -1365,12 +1365,12 @@ else fi # Inform user -echo -e "Call \033[1;34marc.sh\033[0m to configure Loader" +echo -e "Call \033[1;31marc.sh\033[0m to configure Loader" echo echo -e "SSH Access:" -echo -e "IP: \033[1;34m${IPCON}\033[0m" -echo -e "User: \033[1;34mroot\033[0m" -echo -e "Password: \033[1;34marc\033[0m" +echo -e "IP: \033[1;31m${IPCON}\033[0m" +echo -e "User: \033[1;31mroot\033[0m" +echo -e "Password: \033[1;31marc\033[0m" echo echo -e "Web Terminal:" -echo -e "Address: \033[1;34mhttp://${IPCON}:7681\033[0m" \ No newline at end of file +echo -e "Address: \033[1;31mhttp://${IPCON}:7681\033[0m" \ No newline at end of file diff --git a/files/initrd/opt/arc/boot.sh b/files/initrd/opt/arc/boot.sh index 2c33064f..50bdee2a 100755 --- a/files/initrd/opt/arc/boot.sh +++ b/files/initrd/opt/arc/boot.sh @@ -19,12 +19,12 @@ TITLE="Version:" TITLE+=" ${ARC_TITLE}" printf "\033[1;30m%*s\n" ${COLUMNS} "" printf "\033[1;30m%*s\033[A\n" ${COLUMNS} "" -printf "\033[1;34m%*s\033[0m\n" ${COLUMNS} "${BANNER}" -printf "\033[1;34m%*s\033[0m\n" $(((${#TITLE} + ${COLUMNS}) / 2)) "${TITLE}" +printf "\033[1;31m%*s\033[0m\n" ${COLUMNS} "${BANNER}" +printf "\033[1;31m%*s\033[0m\n" $(((${#TITLE} + ${COLUMNS}) / 2)) "${TITLE}" TITLE="Boot:" [ ${EFI} -eq 1 ] && TITLE+=" [UEFI]" || TITLE+=" [Legacy]" TITLE+=" [${BUS}]" -printf "\033[1;34m%*s\033[0m\n" $(((${#TITLE} + ${COLUMNS}) / 2)) "${TITLE}" +printf "\033[1;31m%*s\033[0m\n" $(((${#TITLE} + ${COLUMNS}) / 2)) "${TITLE}" # Check if DSM zImage/Ramdisk is changed, patch it if necessary, update Files if necessary ZIMAGE_HASH="$(readConfigKey "zimage-hash" "${USER_CONFIG_FILE}")" @@ -177,11 +177,11 @@ if [ "${DIRECTBOOT}" = "true" ]; then CMDLINE_DIRECT=$(echo ${CMDLINE_LINE} | sed 's/>/\\\\>/g') # Escape special chars grub-editenv ${GRUB_PATH}/grubenv set dsm_cmdline="${CMDLINE_DIRECT}" grub-editenv ${GRUB_PATH}/grubenv set next_entry="direct" - echo -e "\033[1;34mReboot with Directboot\033[0m" + echo -e "\033[1;31mReboot with Directboot\033[0m" exec reboot elif [ "${DIRECTBOOT}" = "false" ]; then BOOTIPWAIT="$(readConfigKey "arc.bootipwait" "${USER_CONFIG_FILE}")" - echo -e "\033[1;34mDetected ${NIC} NIC.\033[0m \033[1;37mWaiting for Connection:\033[0m" + echo -e "\033[1;31mDetected ${NIC} NIC.\033[0m \033[1;37mWaiting for Connection:\033[0m" for ETH in ${ETHX}; do IP="" DRIVER="$(ls -ld /sys/class/net/${ETH}/device/driver 2>/dev/null | awk -F '/' '{print $NF}')" @@ -191,7 +191,7 @@ elif [ "${DIRECTBOOT}" = "false" ]; then MSG="DHCP" if [ -n "${IP}" ]; then SPEED=$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}') - echo -e "\r\033[1;37m${DRIVER} (${SPEED} | ${MSG}):\033[0m Access \033[1;34mhttp://${IP}:5000\033[0m to connect to DSM via web." + echo -e "\r\033[1;37m${DRIVER} (${SPEED} | ${MSG}):\033[0m Access \033[1;31mhttp://${IP}:5000\033[0m to connect to DSM via web." ethtool -s ${ETH} wol g 2>/dev/null [ ! -n "${IPCON}" ] && IPCON="${IP}" break @@ -233,7 +233,7 @@ elif [ "${DIRECTBOOT}" = "false" ]; then echo -e "\033[1;37m"Booting DSM..."\033[0m" for T in $(w | grep -v "TTY" | awk -F' ' '{print $2}') do - echo -e "\n\033[1;37mThis interface will not be operational. Wait a few minutes.\033[0m\nUse \033[1;34mhttp://${IPCON}:5000\033[0m or try \033[1;34mhttp://find.synology.com/ \033[0mto find DSM and proceed.\n" >"/dev/${T}" 2>/dev/null || true + echo -e "\n\033[1;37mThis interface will not be operational. Wait a few minutes.\033[0m\nUse \033[1;31mhttp://${IPCON}:5000\033[0m or try \033[1;31mhttp://find.synology.com/ \033[0mto find DSM and proceed.\n" >"/dev/${T}" 2>/dev/null || true done # Clear logs for dbgutils addons diff --git a/files/initrd/opt/arc/init.sh b/files/initrd/opt/arc/init.sh index cb487ed4..aa01619f 100755 --- a/files/initrd/opt/arc/init.sh +++ b/files/initrd/opt/arc/init.sh @@ -21,12 +21,12 @@ TITLE="Version:" TITLE+=" ${ARC_TITLE}" printf "\033[1;30m%*s\n" ${COLUMNS} "" printf "\033[1;30m%*s\033[A\n" ${COLUMNS} "" -printf "\033[1;34m%*s\033[0m\n" ${COLUMNS} "${BANNER}" -printf "\033[1;34m%*s\033[0m\n" $(((${#TITLE} + ${COLUMNS}) / 2)) "${TITLE}" +printf "\033[1;31m%*s\033[0m\n" ${COLUMNS} "${BANNER}" +printf "\033[1;31m%*s\033[0m\n" $(((${#TITLE} + ${COLUMNS}) / 2)) "${TITLE}" TITLE="Boot:" [ ${EFI} -eq 1 ] && TITLE+=" [UEFI]" || TITLE+=" [Legacy]" TITLE+=" [${BUS}]" -printf "\033[1;34m%*s\033[0m\n" $(((${#TITLE} + ${COLUMNS}) / 2)) "${TITLE}" +printf "\033[1;31m%*s\033[0m\n" $(((${#TITLE} + ${COLUMNS}) / 2)) "${TITLE}" # Check for Config File if [ ! -f "${USER_CONFIG_FILE}" ]; then @@ -126,8 +126,8 @@ writeConfigKey "vid" ${VID} "${USER_CONFIG_FILE}" writeConfigKey "pid" ${PID} "${USER_CONFIG_FILE}" # Inform user -echo -e "Loader Disk: \033[1;34m${LOADER_DISK}\033[0m" -echo -e "Loader Disk Type: \033[1;34m${BUS}\033[0m" +echo -e "Loader Disk: \033[1;31m${LOADER_DISK}\033[0m" +echo -e "Loader Disk Type: \033[1;31m${BUS}\033[0m" # Load keymap name LAYOUT="$(readConfigKey "layout" "${USER_CONFIG_FILE}")" @@ -135,7 +135,7 @@ KEYMAP="$(readConfigKey "keymap" "${USER_CONFIG_FILE}")" # Loads a keymap if is valid if [ -f "/usr/share/keymaps/i386/${LAYOUT}/${KEYMAP}.map.gz" ]; then - echo -e "Loading Keymap: \033[1;34m${LAYOUT}/${KEYMAP}\033[0m" + echo -e "Loading Keymap: \033[1;31m${LAYOUT}/${KEYMAP}\033[0m" zcat "/usr/share/keymaps/i386/${LAYOUT}/${KEYMAP}.map.gz" | loadkeys fi echo @@ -145,22 +145,22 @@ BUILDDONE="$(readConfigKey "arc.builddone" "${USER_CONFIG_FILE}")" # Decide if boot automatically if grep -q "force_arc" /proc/cmdline; then - echo -e "\033[1;34mStarting Config Mode...\033[0m" + echo -e "\033[1;31mStarting Config Mode...\033[0m" elif grep -q "automated_arc" /proc/cmdline; then - echo -e "\033[1;34mStarting Automated Config Mode...\033[0m" + echo -e "\033[1;31mStarting Automated Config Mode...\033[0m" elif grep -q "update_arc" /proc/cmdline; then - echo -e "\033[1;34mStarting Update Mode...\033[0m" + echo -e "\033[1;31mStarting Update Mode...\033[0m" elif [ "${BUILDDONE}" = "true" ]; then - echo -e "\033[1;34mStarting DSM Mode...\033[0m" + echo -e "\033[1;31mStarting DSM Mode...\033[0m" boot.sh && exit 0 else - echo -e "\033[1;34mStarting Config Mode...\033[0m" + echo -e "\033[1;31mStarting Config Mode...\033[0m" fi echo BOOTIPWAIT="$(readConfigKey "arc.bootipwait" "${USER_CONFIG_FILE}")" [ -z "${BOOTIPWAIT}" ] && BOOTIPWAIT=20 -echo -e "\033[1;34mDetected ${NIC} NIC.\033[0m \033[1;37mWaiting for Connection:\033[0m" +echo -e "\033[1;31mDetected ${NIC} NIC.\033[0m \033[1;37mWaiting for Connection:\033[0m" for ETH in ${ETHX}; do IP="" STATICIP="$(readConfigKey "static.${ETH}" "${USER_CONFIG_FILE}")" @@ -183,7 +183,7 @@ for ETH in ${ETHX}; do if [ -n "${IP}" ]; then SPEED=$(ethtool ${ETH} 2>/dev/null | grep "Speed:" | awk '{print $2}') writeConfigKey "ip.${ETH}" "${IP}" "${USER_CONFIG_FILE}" - echo -e "\r\033[1;37m${DRIVER} (${SPEED} | ${MSG}):\033[0m Access \033[1;34mhttp://${IP}:7681\033[0m to connect to Arc via web." + echo -e "\r\033[1;37m${DRIVER} (${SPEED} | ${MSG}):\033[0m Access \033[1;31mhttp://${IP}:7681\033[0m to connect to Arc via web." ethtool -s ${ETH} wol g 2>/dev/null break fi @@ -204,10 +204,10 @@ done # Inform user echo -echo -e "Call \033[1;34marc.sh\033[0m to configure Arc" +echo -e "Call \033[1;31marc.sh\033[0m to configure Arc" echo -echo -e "User config is on \033[1;34m${USER_CONFIG_FILE}\033[0m" -echo -e "Default SSH Root password is \033[1;34marc\033[0m" +echo -e "User config is on \033[1;31m${USER_CONFIG_FILE}\033[0m" +echo -e "Default SSH Root password is \033[1;31marc\033[0m" echo mkdir -p "${ADDONS_PATH}" @@ -218,7 +218,7 @@ mkdir -p "${PATCH_PATH}" mkdir -p "${BACKUPDIR}" # Load Arc Overlay -echo -e "\033[1;34mLoading Arc Overlay...\033[0m" +echo -e "\033[1;31mLoading Arc Overlay...\033[0m" sleep 2 # Check memory and load Arc diff --git a/files/p1/boot/grub/grub.cfg b/files/p1/boot/grub/grub.cfg index 6bcb3af9..a21c87c8 100644 --- a/files/p1/boot/grub/grub.cfg +++ b/files/p1/boot/grub/grub.cfg @@ -50,7 +50,7 @@ if loadfont unicode; then fi set menu_color_normal=white/black -set menu_color_highlight=white/blue +set menu_color_highlight=white/red set color_normal=white/black if serial --unit=0 --speed=115200; then