mirror of
https://gitlab.com/prism7/archery.git
synced 2025-02-15 08:29:17 +01:00
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)
This commit is contained in:
27
Amelia.sh
27
Amelia.sh
@@ -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
|
||||||
until slct_font; do : ; done
|
if [[ "${tty}" == *"tty"* && "${run_as}" == "root" ]]; then
|
||||||
elif [[ "${tty}" == *"pts"* && -f /usr/share/kbd/consolefonts/ter-v18b.psf.gz && -f /usr/share/kbd/consolefonts/ter-v32b.psf.gz ]]; then
|
until slct_font; do : ; done
|
||||||
MAGENTABG " 'Terminus Font' detected > Switch to console (tty) and re-run the installer to activate "
|
else
|
||||||
echo
|
MAGENTABG " 'Terminus Font' detected > Log In as 'ROOT' in console & re-run to enable "
|
||||||
|
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
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
|
|||||||
Reference in New Issue
Block a user