Archives
/
manjaro-architect
mirror of https://gitlab.manjaro.org/applications/manjaro-architect
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #129 from Chrysostomus/keymap

Browse Source 
Select keymap automatically based on language selection
merge-requests/273/head
Bernhard Landauer 8 years ago committed by GitHub
parent 7da4691941 4af00c825d
commit 1172ed527c
13 changed files with 167 additions and 107 deletions
Show Stats Download Patch File Download Diff File

2
bin/manjaro-architect.in
Unescape Escape View File

@ -34,7 +34,7 @@ fi
[[ $1 == "-d" ]] && declare -i debug=1
id_system
select_language
set_language
mk_connection
check_requirements
greeting

7
data/translations/danish.trans
Unescape Escape View File

@ -22,11 +22,13 @@ _PassErrBody="Adgangskoderne er ikke ens. Prøv igen."
# Basics
_SelLang="Sprogvalg"
_Lang="Sprog"
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="Internet forbindelse er ikke aktiv"
_EstCon="Opret forbindelse?"
_Config="Opsæt"
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Security and Tweaks
@ -154,6 +156,7 @@ _MIrrorPacQ="Brug denne opsætning til det færdige system? Hvis ja, vil filen b
# Set Keymap (vconsole)
_VCKeymapTitle="Vælg Terminal Tastatur Layout"
_DefKeymap="The default keymap for your selected language is" # translate me !
_VCKeymapBody="En Terminal er en kommando prompt i et ikke-grafisk miljø. Tastatur layout er uafhængigt af Skrivebord"
# Set Xkbmap (environment)

17
data/translations/dutch.trans
Unescape Escape View File

@ -19,13 +19,15 @@ _ErrTitle="Fout"
_PassErrBody="De ingegeven wachtwoorden zijn niet identiek. Probeer opnieuw aub."
# Basics
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Veiligheid en aanpassingen
@ -153,6 +155,7 @@ _MIrrorPacQ="Wil je het aangepast pacman configuratiebestand gebruiken voor het
# Stel het toetsenbord in (vconsole)
_VCKeymapTitle="Stel de Virtuele Console in"
_DefKeymap="The default keymap for your selected language is" # translate me !
_VCKeymapBody="Een virtuele console is een shell prompt in een niet-grafische omgeving. De toetsenbordindeling ervan is onafhankelijk van een desktop suite / terminal."
# stel Xkbmap in (omgeving)

3
data/translations/english.trans
Unescape Escape View File

@ -21,6 +21,8 @@ _PassErrBody="The passwords entered do not match. Please try again."
# Basics
_SelLang="Select Language"
_Lang="Language"
_Keymap="Keymap"
_Change="Would you like to change the settings?"
_NoCon="No Internet Detected."
_EstCon="Establish connection?"
_Config="Configure"
@ -152,6 +154,7 @@ _MIrrorPacQ="Use edited pacman configuration for installed system? If Yes, the f
# Set Keymap (vconsole)
_VCKeymapTitle="Set Virtual Console"
_DefKeymap="The default keymap for your selected language is"
_VCKeymapBody="A virtual console is a shell prompt in a non-graphical environment. Its keymap is independent of a desktop environment / terminal."
# Set Xkbmap (environment)

3
data/translations/french.trans
Unescape Escape View File

@ -22,6 +22,8 @@ _PassErrBody="Les mots de passe entrés ne correspondent pas. Veuillez réessaye
# Basics
_SelLang="Choisir la langue"
_Lang="Langue"
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="Pas de connexion Internet détectée."
_EstCon="Établir la connexion ?"
_Config="Configurer"
@ -154,6 +156,7 @@ _MIrrorPacQ="Utiliser la configuration modifiée de pacman pour le système inst
# Configurer l'agencement du clavier (vconsole)
_VCKeymapTitle="Configurer la console virtuelle"
_DefKeymap="The default keymap for your selected language is" # translate me !
_VCKeymapBody="Une console virtuelle est une invite de commande (shell prompt) dans un environnement non graphique. Son agencement clavier est indépendant du terminal / environnement de bureau."
# Configurer Xkbmap (environnement)

3
data/translations/german.trans
Unescape Escape View File

@ -20,6 +20,8 @@ _PassErrBody="Die eingegebenen Passwörter sind nicht gleich. Bitte erneut versu
# Basics
_SelLang="Sprachauswahl"
_Lang="Sprache"
_Keymap="Tastaturbelegung"
_Change="Möchten Sie die Einstellungen ändern?"
_NoCon="Keine Internetverbindung."
_EstCon="Verbindung herstellen?"
_Config="Konfiguration"
@ -152,6 +154,7 @@ _MIrrorPacQ="Die editierte Pacman-Konfiguration für das installierte System nut
# Set Keymap (vconsole)
_VCKeymapTitle="Konsolensprache einstellen"
_DefKeymap="Die automatisch ausgewählte Tastaturbelegung ist"
_VCKeymapBody="Eine virtuelle Konsole ist das Kommandozeilen-Interface einer nicht-graphischen Umgebung.\nIhr Tastaturlayout ist unabhängig von der Desktop-Umgebung."
# Set Xkbmap (environment)

3
data/translations/hungarian.trans
Unescape Escape View File

@ -20,6 +20,8 @@ _PassErrBody="A megadott jelszavak nem egyeznek. Kérlek próbáld újra."
# Alap beállítások
_SelLang="Válassz nyelvet"
_Lang="Nyelv"
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="Nincs internetkapcsolat."
_EstCon="Kapcsolódni akarsz az internethez?"
_Config="Beállítás"
@ -151,6 +153,7 @@ _MirrorPacQ="Használni akarod a szerkesztett 'pacman' konfigurációt a telepí
# Virtuális konzol billentyűzetkiosztásának beállítása \(vconsole\)
_VCKeymapTitle="Virtuális konzol beállítása"
_DefKeymap="The default keymap for your selected language is" # translate me !
_VCKeymapBody="A virtuális konzol egy nem grafikus környezetben futó 'shell prompt'. A billentyűzetkiosztása független az asztali környezettől."
# Asztali környezet billentyűzetkioszásának beállítása \(Xkbmap\)

17
data/translations/italian.trans
Unescape Escape View File

@ -19,13 +19,15 @@ _ErrTitle="Errore"
_PassErrBody="Le password digitate non corrispondono. Provare nuovamente."
# Basics
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Security and Tweaks
@ -153,6 +155,7 @@ _MIrrorPacQ="Usare la configurazione pacman modificata per il sistema installato
# Impostazione tastiera (vconsole)
_VCKeymapTitle="Imposta Virtual Console"
_DefKeymap="The default keymap for your selected language is" # translate me !
_VCKeymapBody="Una virtual console è un prompt di comando in un ambiente non-grafico. La sua mappatura tastiera è indipendente da quella per l'ambiente desktop / terminale."
# Impostazione Xkbmap (ambiente desktop)

17
data/translations/portuguese.trans
Unescape Escape View File

@ -19,13 +19,15 @@ _ErrTitle="Erro"
_PassErrBody="As senhas digitadas não coincidem. Por favor, tente novamente."
# Basics
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Segurança e Ajustes
@ -152,6 +154,7 @@ _MIrrorPacQ="Utilizar o arquivo de configuração editado do pacman para o siste
# Definir Layout de teclado (vconsole)
_VCKeymapTitle="Definir Console Virtual"
_DefKeymap="The default keymap for your selected language is" # translate me !
_VCKeymapBody="Um console virtual é um prompt do shell em um ambiente não-gráfico. Seu layout de teclado é independente de um ambiente de desktop / terminal."
# Definir Xkbmap (ambiente)

17
data/translations/portuguese_brasil.trans
Unescape Escape View File

@ -19,13 +19,15 @@ _ErrTitle="Erro"
_PassErrBody="As senhas digitadas não coincidem. Por favor, tente novamente."
# Basics
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Segurança e Ajustes
@ -153,6 +155,7 @@ _MIrrorPacQ="Utilizar o arquivo de configuração editado do pacman para o siste
# Definir layout de teclado (vconsole)
_VCKeymapTitle="Definir console virtual"
_DefKeymap="The default keymap for your selected language is" # translate me !
_VCKeymapBody="Um console virtual é um prompt do shell em um ambiente não-gráfico. Seu layout de teclado é independente de um ambiente de desktop / terminal."
# Definir Xkbmap (ambiente)

3
data/translations/russian.trans
Unescape Escape View File

@ -21,6 +21,8 @@ _PassErrBody="Введеные пароли не совпадают. Пожал
# Basics
_SelLang="Выбрать язык"
_Lang="Язык"
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="Интернет не найден."
_EstCon="Установить соединение?"
_Config="Настроить"
@ -153,6 +155,7 @@ _MIrrorPacQ="Использовать отредактированный кон
# Set Keymap (vconsole)
_VCKeymapTitle="Настройка виртуальной консоли"
_DefKeymap="The default keymap for your selected language is" # translate me !
_VCKeymapBody="Виртуальная консоль представляет собой оболочку командной строки в неграфической среде. Ее раскладка не зависит от среды рабочего стола / терминала."
# Set Xkbmap (environment)

17
data/translations/spanish.trans
Unescape Escape View File

@ -19,13 +19,15 @@ _ErrTitle="Error"
_PassErrBody="Las contraseñas introducidas no coinciden. Vuelva a intentarlo."
# Basics
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_SelLang="Select Language" # translate me !
_Lang="Language" # translate me !
_Keymap="Keymap" # translate me !
_Change="Would you like to change the settings?" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Select Menu" # translate me !
_ChMenuBody="The Regular Menu will guide you through the installation of a pre-configured Manjaro Environment with some additional choices.\n\nThe Advanced Menu can be used to install unconfigured desktops or Manjaro development profiles and also includes an additional selection of network and multimedia applications and some advanced options for system and security configuration." # translate me !
# Seguridad y ajustes
@ -153,6 +155,7 @@ _MIrrorPacQ="¿Utilizar el archivo de configuración de 'pacman' editado para el
# Seleccionar distribución de teclado de la consola virtual (vconsole)
_VCKeymapTitle="Seleccionar distribución de teclado de la consola virtual"
_DefKeymap="The default keymap for your selected language is" # translate me !
_VCKeymapBody="Una consola virtual es un intérprete de comandos en un entorno no gráfico. Su distribución de teclado es independiente de un entorno de escritorio o terminal."
# Seleccionar Xkbmap (entorno)

165
lib/util.sh
Unescape Escape View File

@ -14,14 +14,12 @@
VERSION="Manjaro Architect Installer v$version"
# Host system information
ARCHI=$(uname -m) # Display whether 32 or 64 bit system
ARCHI=$(uname -m) # Display whether 32 or 64 bit system
SYSTEM="Unknown" # Display whether system is BIOS or UEFI. Default is "unknown"
H_INIT="" # Host init-sys
NW_CMD="" # command to launch the available network client
# Locale and Language
LANGSEL="/tmp/.language"
KEYSEL="/tmp/.keymap"
CURR_LOCALE="en_US.UTF-8" # Default Locale
FONT="" # Set new font if necessary
KEYMAP="us" # Virtual console keymap. Default is "us"
@ -38,7 +36,7 @@ SUB_MENU="" # Submenu to be highlighted
PARENT="" # the parent menu
# Temporary files to store menu selections and errors
ANSWER="/tmp/.answer" # Basic menu selections
ANSWER="/tmp/.answer" # Basic menu selections
PACKAGES="/tmp/.pkgs" # Packages to install
MOUNT_OPTS="/tmp/.mnt_opts" # Filesystem Mount options
INIT="/tmp/.init" # init systemd|openrc
@ -68,7 +66,7 @@ LV_SIZE_INVALID=0 # Is LVM LV size entered valid?
VG_SIZE_TYPE="" # Is VG in Gigabytes or Megabytes?
# Mounting
MOUNT="" # Installation: All other mounts branching
MOUNT="" # Installation: All other mounts branching
MOUNTPOINT="/mnt" # Installation: Root mount from Root
FS_OPTS="" # File system special mount options available
CHK_NUM=16 # Used for FS mount options checklist length
@ -106,8 +104,8 @@ DIALOG() {
}
# store datas in ini file
# read: value=$(ini system.init)
# set: ini system.init "openrc"
# read: value=$(ini system.init)
# set: ini system.init "openrc"
ini() {
local section="$1" value="$2"
[[ ! -f "$INIFILE" ]] && echo "">"$INIFILE"
@ -208,95 +206,116 @@ check_for_error() {
fi
}
# Add locale on-the-fly and sets source translation file for installer
select_language() {
fl="1" # terminus-font variation supporting most languages, to be processed in set_keymap()
if [[ $(cat ${LANGSEL} 2>/dev/null) == "" ]]; then
DIALOG " Select Language " --default-item '3' --menu "\n " 0 0 11 \
"1" $"Danish|(da_DK)" \
"2" $"Dutch|(nl_NL)" \
"3" $"English|(en_**)" \
"4" $"French|(fr_FR)" \
"5" $"German|(de_DE)" \
"6" $"Hungarian|(hu_HU)" \
"7" $"Italian|(it_IT)" \
"8" $"Portuguese|(pt_PT)" \
"9" $"Portuguese [Brasil]|(pt_BR)" \
"10" $"Russian|(ru_RU)" \
"11" $"Spanish|(es_ES)" 2>${LANGSEL}
set_language() {
if [[ ! $(grep font /var/log/m-a.ini 2>/dev/null) ]]; then
select_language
else
CURR_LOCALE="$(grep lang /var/log/m-a.ini | cut -d' ' -f3)"
KEYMAP="$(grep keymap /var/log/m-a.ini | cut -d' ' -f3)"
FONT="$(grep font /var/log/m-a.ini | cut -d' ' -f3)"
TRANS="$(grep translation /var/log/m-a.ini | cut -d' ' -f3)"
import $DATADIR/translations/$TRANS.trans
ini translation "$TRANS"
# does user want to change the old settings?
DIALOG " $_SelLang " --yesno "\n${_Lang}: [ ${TRANS^} ]\n${_Keymap}: [ ${KEYMAP} ]\n\n${_Change}\n " 0 0 && select_language
fi
case $(cat ${LANGSEL}) in
"1") source $DATADIR/translations/danish.trans
# Generate locale and set language
DIALOG " $_Config " --infobox "\n$_ApplySet\n " 0 0
sed -i "s/#${CURR_LOCALE}/${CURR_LOCALE}/" /etc/locale.gen
locale-gen >/dev/null 2>$ERR
export LANG=${CURR_LOCALE}
check_for_error "set LANG=${CURR_LOCALE}" $?
ini system.lang "$CURR_LOCALE"
loadkeys $KEYMAP 2>$ERR
check_for_error "loadkeys $KEYMAP" "$?"
ini linux.keymap "$KEYMAP"
setfont $FONT 2>$ERR
check_for_error "set font $FONT" $?
ini linux.font "$FONT"
# store settings for re-use in target install ## to be accomplished via ini in the future
echo -e "KEYMAP=${KEYMAP}\nFONT=${FONT}" > /tmp/vconsole.conf
echo -e "consolefont=\"${FONT}\"" > /tmp/consolefont
echo -e "keymap=\"$KEYMAP\"" > /tmp/keymap
}
# set locale, keymap and font and source translation file for installer
select_language() {
fl="1" # terminus-font variation supporting most languages
DIALOG " Select Language " --default-item '3' --menu "\n " 0 0 11 \
"1" $"Danish|(da_DK)" \
"2" $"Dutch|(nl_NL)" \
"3" $"English|(en_**)" \
"4" $"French|(fr_FR)" \
"5" $"German|(de_DE)" \
"6" $"Hungarian|(hu_HU)" \
"7" $"Italian|(it_IT)" \
"8" $"Portuguese|(pt_PT)" \
"9" $"Portuguese [Brasil]|(pt_BR)" \
"10" $"Russian|(ru_RU)" \
"11" $"Spanish|(es_ES)" 2>${ANSWER}
case $(cat ${ANSWER}) in
"1") TRANS="danish"
CURR_LOCALE="da_DK.UTF-8"
KEYMAP="dk"
;;
"2") source $DATADIR/translations/dutch.trans
"2") TRANS="dutch"
CURR_LOCALE="nl_NL.UTF-8"
KEYMAP="nl"
;;
"3") source $DATADIR/translations/english.trans
"3") TRANS="english"
CURR_LOCALE="en_US.UTF-8"
KEYMAP="us"
;;
"4") source $DATADIR/translations/french.trans
"4") TRANS="french"
CURR_LOCALE="fr_FR.UTF-8"
KEYMAP="fr"
;;
"5") source $DATADIR/translations/german.trans
"5") TRANS="german"
CURR_LOCALE="de_DE.UTF-8"
KEYMAP="de"
;;
"6") source $DATADIR/translations/hungarian.trans
"6") TRANS="hungarian"
CURR_LOCALE="hu_HU.UTF-8"
KEYMAP="hu"
fl="2"
;;
"7") source $DATADIR/translations/italian.trans
"7") TRANS="italian"
CURR_LOCALE="it_IT.UTF-8"
KEYMAP="it"
;;
"8") source $DATADIR/translations/portuguese.trans
"8") TRANS="portuguese"
CURR_LOCALE="pt_PT.UTF-8"
KEYMAP="pt-latin1"
;;
"9") source $DATADIR/translations/portuguese_brasil.trans
"9") TRANS="portuguese_brasil"
CURR_LOCALE="pt_BR.UTF-8"
KEYMAP="pt-latin1"
;;
"10") source $DATADIR/translations/russian.trans
"10") TRANS="russian"
CURR_LOCALE="ru_RU.UTF-8"
KEYMAP="ru"
fl="u"
;;
"11") source $DATADIR/translations/spanish.trans
"11") TRANS="spanish"
CURR_LOCALE="es_ES.UTF-8"
KEYMAP="es"
;;
*) clear && exit 0
;;
esac
if [[ $(cat ${KEYSEL} 2>/dev/null) == "" ]]; then
set_keymap
fi
# source translation file
import $DATADIR/translations/$TRANS.trans
ini translation "$TRANS"
# Generate the chosen locale and set the language
DIALOG " $_Config " --infobox "\n$_ApplySet\n " 0 0
sed -i "s/#${CURR_LOCALE}/${CURR_LOCALE}/" /etc/locale.gen
locale-gen >/dev/null 2>$ERR
export LANG=${CURR_LOCALE}
check_for_error "set LANG=${CURR_LOCALE}" $?
ini system.lang "$CURR_LOCALE"
}
# virtual console keymap and font
set_keymap() {
KEYMAPS=""
for i in $(ls -R /usr/share/kbd/keymaps | grep "map.gz" | sed 's/\.map\.gz//g' | sort); do
KEYMAPS="${KEYMAPS} ${i} -"
done
DIALOG " $_VCKeymapTitle " --menu "\n$_VCKeymapBody\n " 20 40 20 ${KEYMAPS} 2>${KEYSEL} || return 0
KEYMAP=$(cat ${KEYSEL})
loadkeys $KEYMAP 2>$ERR
check_for_error "loadkeys $KEYMAP" "$?"
ini linux.keymap "$KEYMAP"
# set keymap for openrc too
echo "keymap=\"$KEYMAP\"" > /tmp/keymap
# adjust terminus font size depending on resolution
biggest_resolution=$(head -n 1 /sys/class/drm/card*/*/modes | awk -F'[^0-9]*' '{print $1}' | awk 'BEGIN{a= 0}{if ($1>a) a=$1 fi} END{print a}')
# Choose terminus font size depending on resolution
if [[ $biggest_resolution -gt 1920 ]]; then
fs="24"
elif [[ $biggest_resolution -eq 1920 ]]; then
@ -304,14 +323,22 @@ set_keymap() {
else
fs="16"
fi
FONT="ter-${fl}${fs}n"
ini linux.font "$FONT"
echo -e "KEYMAP=${KEYMAP}\nFONT=${FONT}" > /tmp/vconsole.conf
echo -e "consolefont=\"${FONT}\"" > /tmp/consolefont
setfont $FONT 2>$ERR
check_for_error "set font $FONT" $?
ini system.font "$FONT"
# does user want to change the default keymap?
DIALOG " $_VCKeymapTitle " --yesno "\n${_DefKeymap}:\n\n[ ${KEYMAP} ]\n\n${_Change}\n " 0 0 && select_keymap
}
select_keymap() {
KEYMAPS=""
for i in $(ls -R /usr/share/kbd/keymaps | grep "map.gz" | sed 's/\.map\.gz//g' | sort); do
KEYMAPS="${KEYMAPS} ${i} -"
done
DIALOG " $_VCKeymapTitle " --menu "\n$_VCKeymapBody\n " 20 40 20 ${KEYMAPS} 2>${ANSWER} || return 0
KEYMAP=$(cat ${ANSWER})
}
mk_connection() {

Write Preview
Loading…
Cancel
Save