albert/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2025-02-15 08:29:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change: Edited 'first_check' function so as to load the 'Select Fonts' stage only when the user is logged in as ROOT in the console (tty)

Browse source
This commit is contained in:
Jane Doe 2024-09-22 14:35:16 +00:00
parent 6d65c6f030
commit eab21626e4
1 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

23
Amelia.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Amelia Installer # Amelia Installer
# Version: 7.6 # Version: 7.6.1
set -euo pipefail set -euo pipefail
trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
@ -348,20 +348,23 @@ failure() {
# FUNCTIONS # FUNCTIONS
first_check() { first_check() {
if [[ "${tty}" == *"tty"* && -f /usr/share/kbd/consolefonts/ter-v18b.psf.gz && -f /usr/share/kbd/consolefonts/ter-v32b.psf.gz ]]; then if [[ -f /usr/share/kbd/consolefonts/ter-v18b.psf.gz && -f /usr/share/kbd/consolefonts/ter-v32b.psf.gz ]]; then
if [[ "${tty}" == *"tty"* && "${run_as}" == "root" ]]; then
until slct_font; do : ; done until slct_font; do : ; done
elif [[ "${tty}" == *"pts"* && -f /usr/share/kbd/consolefonts/ter-v18b.psf.gz && -f /usr/share/kbd/consolefonts/ter-v32b.psf.gz ]]; then else
MAGENTABG " 'Terminus Font' detected > Switch to console (tty) and re-run the installer to activate " MAGENTABG " 'Terminus Font' detected > Log In as 'ROOT' in console & re-run to enable "
echo echo
fi fi
fi
if [[ "${run_as}" == "root" ]]; then if [[ "${run_as}" == "root" ]]; then
REDBGBL " ${yellow}---------------------------------------- " REDBG " ${yellow}---------------------------------------- "
REDBGBL " ${yellow}### The Installer Runs In ROOT Mode ### " REDBG " ${yellow}### The Installer Runs In ROOT Mode ### "
REDBGBL " ${yellow}---------------------------------------- " REDBG " ${yellow}---------------------------------------- "
else else
YELLOWBGBL " ---------------------------------------- " YELLOWBG " ---------------------------------------- "
YELLOWBGBL " ### The Installer Runs In DEMO Mode ### " YELLOWBG " ### The Installer Runs In DEMO Mode ### "
YELLOWBGBL " ---------------------------------------- " YELLOWBG " ---------------------------------------- "
fi fi
} }
################################################################################################### ###################################################################################################