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

Merge branch 'master' into keymap

Browse Source
merge-requests/273/head
Bernhard Landauer 8 years ago committed by GitHub
parent 194f390bed f4c0901dc3
commit ac02029f43
15 changed files with 259 additions and 254 deletions
Show Stats Download Patch File Download Diff File

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

@ -25,7 +25,7 @@ _Lang="Sprog"
_NoCon="Internet forbindelse er ikke aktiv"
_EstCon="Opret forbindelse?"
_Config="Opsæt"
_ApplySet=" Opretter forbindelse ..."
_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 !
@ -341,7 +341,8 @@ _InstBsMenuTitle="Installer Base"
_InstBseMenuBody="Pakker der installeres skal hentes fra internet servere. Pacstrap scriptet installerer det grundlæggende system. For at kunne bygge pakker fra AUR eller med ABS, skal gruppen base-devel også installeres."
_InstBse="Installer Base pakker"
_ChsInit="Vælg system type"
_WarnOrc="Nogle Manjaro udgaver som Gnome kan ikke bruges med openrc"
_Note="Note!" # translate me !
_WarnOrc="These Manjaro profiles are incompatible with openrc:" # translate me !
_ChsAddPkgs="Vælg ekstra moduler til kernen"
_InstBootldr="Installer Bootloader"
_InstDrvTitle="Install Hardware Drivers" # translate me !

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

@ -24,7 +24,7 @@ _Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet=" Applying settings ..." # 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 !
@ -340,7 +340,8 @@ _InstBsMenuTitle=" Installeer het Basissysteem"
_InstBseMenuBody="De gewenste pakketten worden gedownload van mirror servers. Het pacstrap script installeert het basissysteem. Indien je pakketten van het AUR of met ABS wenst te gebruiken, is de basis-devel groep ook vereist."
_InstBse="Installeer het Basissysteem"
_ChsInit="Choose your initsystem" # translate me !
_WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
_Note="Note!" # translate me !
_WarnOrc="These Manjaro profiles are incompatible with openrc:" # translate me !
_ChsAddPkgs="Choose additional modules for your kernels" # translate me !
_InstBootldr="Installeer de Bootlader"
_InstDrvTitle="Install Hardware Drivers" # translate me !

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

@ -339,7 +339,8 @@ _InstBsMenuTitle="Install Base"
_InstBseMenuBody="Packages to be installed must be downloaded from mirror servers. The pacstrap script installs the base system. To build packages from the AUR or with ABS, the base-devel group is also required."
_InstBse="Install Base Packages"
_ChsInit="Choose your initsystem"
_WarnOrc="Some manjaro editions like gnome are incompatible with openrc"
_Note="Note!"
_WarnOrc="These Manjaro profiles are incompatible with openrc:"
_ChsAddPkgs="Choose additional modules for your kernels"
_InstBootldr="Install Bootloader"
_InstDrvTitle="Install Hardware Drivers"

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

@ -25,7 +25,7 @@ _Lang="Langue"
_NoCon="Pas de connexion Internet détectée."
_EstCon="Établir la connexion ?"
_Config="Configurer"
_ApplySet="Application des paramètres ..."
_ApplySet="Apply language settings ..." # translate me !
_ChMenu="Sélectionner un menu"
_ChMenuBody="Le Menu \"Regular\" vous guidera à travers l'installation d'un environnement pré-configuré Manjaro avec quelques choix supplémentaires.\n\nLe menu Avancé peut être utilisé pour installer des postes de travail non configurés ou des profils de développement Manjaro et inclut également une sélection supplémentaire d'applications réseau et multimédia et certaines options avancées pour la configuration du système et de sa sécurité."
@ -341,7 +341,8 @@ _InstBsMenuTitle="Installer Base"
_InstBseMenuBody="Les paquets à installer doivent être téléchargés à partir des serveurs miroirs. Le script pacstrap installe le système de base. Pour construire des paquets à partir d'AUR ou avec ABS, le groupe base-devel est également nécessaire."
_InstBse="Installer les paquets de Base"
_ChsInit="Choisir son système d'init"
_WarnOrc="Quelques éditions manjaro comme gnome sont incompatibles avec openrc"
_Note="Note!" # translate me !
_WarnOrc="These Manjaro profiles are incompatible with openrc:" # translate me !
_ChsAddPkgs="Choisir des modules additionnels pour le noyau"
_InstBootldr="Installer le chargeur d'amorçage"
_InstDrvTitle="Installer les pilotes matériels"

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

@ -23,7 +23,7 @@ _Lang="Sprache"
_NoCon="Keine Internetverbindung."
_EstCon="Verbindung herstellen?"
_Config="Konfiguration"
_ApplySet="Einstellungen speichern ..."
_ApplySet="Spracheinstellungen werden\nangewendet ..."
_ChMenu="Menu wählen"
_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 !
@ -48,7 +48,7 @@ _btrfsSVErrBody="Leerzeichen oder keine Zeichen sind nicht erlaubt. Bitte nochma
_btrfsSVBody1="Gebe den Namen für das Subvolume ein"
_btrfsSVBody2="zu erzeugen in"
_btrfsSVBody3="Dieser Prozess wird wiederholt bis ein Sternchen (*) als Name für ein Subvolume eigegeben wird.\n\nErzeugte Subvolumes:"
_btrfsMntBody="[Leerzeichen] drücken, um den gewünschten Einhängepunkt aus- oder abzuwählen.\nBitte achten Sie darauf, keine inkompatiblen Optionen zu wählen."
_btrfsMntBody="[Leerzeichen] drücken, um die gewünschten Einhängeoptionen aus- oder abzuwählen.\nBitte achten Sie darauf, keine inkompatiblen Optionen zu wählen."
_btrfsMntConfBody="Bestätigen Sie die Auswahl der Einhängeoptionen:"
# Autopartition
@ -126,7 +126,7 @@ _DevShowOpt="Blockgeräte auflisten (optional)"
# Check Requirements
_ChkTitle="Prüfe Voraussetzungen"
_ChkBody="Es wird geprüft, ob der Installer als Root gestartet wurde und es eine aktive Internetverbindung gibt. Bitte warten..."
_ChkBody="Es wird geprüft, ob der Installer als Root gestartet wurde und es eine aktive Internetverbindung gibt.\nBitte warten..."
_RtFailBody="Der Installer muss als Root gestatet werden. Verlasse das Programm..."
_ConFailBody="Test der Internetverbindung schlug fehl. Verlasse das Programm..."
_ReqMetTitle="Voraussetzungen sind erfüllt."
@ -205,7 +205,7 @@ _WarnMount2="zu Beginn des Dateisystem-Menüs aus.\n\nStellen Sie sicher, dass d
# Select Device (installation)
_DevSelTitle="Wähle Blockgerät"
_DevSelBody="Blockgeräte (/dev/) sind die für die Installation zur Vefügung stehnenden Festplatten und USB-Sticks. Das erste ist /sda, das zweite /sdb usw...\n\nFalls Sie von einem USB-Stick booten, auf dem Manjaro-Architect installtiert ist, seien Sie vorsichtig, da dieser USB-Stick auc als verfügbar aufgelistet sein wird!"
_DevSelBody="Blockgeräte (/dev/) sind die für die Installation zur Vefügung stehnenden Festplatten und USB-Sticks. Das erste ist /sda, das zweite /sdb usw...\n\nFalls Sie von einem USB-Stick booten, auf dem Manjaro-Architect installtiert ist, seien Sie vorsichtig, da dieser USB-Stick auch als verfügbar aufgelistet sein wird!"
# Partitioning Tool
_PartToolTitle="Partitionierungs-Tool"
@ -339,7 +339,8 @@ _InstBsMenuTitle="Basis installieren"
_InstBseMenuBody="Die zu installierenden Pakete müssen von einem Mirror heruntergeladen werden.\nUm später auch Pakete aus dem AUR bauen zu können muss außerdem die base-devel Gruppe installiert werden."
_InstBse="Basispakete installieren"
_ChsInit="Wähle das Initsystem"
_WarnOrc="Achtung!\nEinzelne Manjaro Editionen wie GNOME sind mit Openrc nicht kompatibel."
_Note="Achtung!"
_WarnOrc="Folgende Manjaro Profile sind nicht mit openrc kompatibel:"
_ChsAddPkgs="Wähle zusätzliche Kernel-Module"
_InstBootldr="Bootloader installieren"
_InstDrvTitle="Installiere Gerätetreiber"

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

@ -23,7 +23,9 @@ _Lang="Nyelv"
_NoCon="Nincs internetkapcsolat."
_EstCon="Kapcsolódni akarsz az internethez?"
_Config="Beállítás"
_ApplySet=" Beállítások alkalmazása ..."
_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 !
# Biztonsági- és rendszerbeállítások
_SecMenuTitle="Biztonsági és \‘systemd\’ beállítások"
@ -335,7 +337,8 @@ _InstBsMenuTitle="Alaprendszer telepítése"
_InstBseMenuBody="A 'pacstrap' script a következőkben telepíteni fogja az alaprendszert, miután letöltötte a szükséges csomagokat a szerver\(ek\)ről. Ha az AUR-ból, vagy ABS-el akarsz csomagokat készíteni, szükséged lesz a 'base-devel' csomagcsoportra."
_InstBse="Alapcsomagok telepítése"
_ChsInit="Válaszd ki az \‘init\’ rendszert"
_WarnOrc="Egyes asztali környezetek, mint például a GNOME, nem kompatibilisek az \‘openrc\’-vel"
_Note="Note!" # translate me !
_WarnOrc="These Manjaro profiles are incompatible with openrc:" # translate me !
_ChsAddPkgs="Válassz további kernelmodulokat"
_InstBootldr="Rendszertöltő telepítése"
_InstDrvTitle="Install Hardware Drivers" # translate me !

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

@ -24,7 +24,7 @@ _Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet=" Applying settings ..." # 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 !
@ -340,7 +340,8 @@ _InstBsMenuTitle="Installazione di base"
_InstBseMenuBody="I pacchetti da installare devono essere scaricati da un mirror. Lo script pacstrap installa il sistema di base. Per compilare pacchetti dallo AUR o con ABS, è richiesto il gruppo pacchetti base-devel."
_InstBse="Installa Pacchetti Base"
_ChsInit="Choose your initsystem" # translate me !
_WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
_Note="Note!" # translate me !
_WarnOrc="These Manjaro profiles are incompatible with openrc:" # translate me !
_ChsAddPkgs="Choose additional modules for your kernels" # translate me !
_InstBootldr="Installa il Bootloader"
_InstDrvTitle="Install Hardware Drivers" # translate me !

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

@ -24,7 +24,7 @@ _Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet=" Applying settings ..." # 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 !
@ -339,7 +339,8 @@ _InstBsMenuTitle="Instalar Base"
_InstBseMenuBody="Pacotes a serem instalados deve ser baixado a partir de servidores mirror. O script pacstrap instala o sistema base. Para construir pacotes do AUR ou com ABS, também é exigido o grupo base-devel."
_InstBse="Instalar Pacotes Base"
_ChsInit="Choose your initsystem" # translate me !
_WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
_Note="Note!" # translate me !
_WarnOrc="These Manjaro profiles are incompatible with openrc:" # translate me !
_ChsAddPkgs="Choose additional modules for your kernels" # translate me !
_InstBootldr="Instalar Bootloader"
_InstDrvTitle="Install Hardware Drivers" # translate me !

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

@ -24,7 +24,7 @@ _Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet=" Applying settings ..." # 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 !
@ -340,7 +340,8 @@ _InstBsMenuTitle="Instalar a Base"
_InstBseMenuBody="Os pacotes a serem instalados devem ser baixados de servidores de espelhos. O script pacstrap instala o sistema base. Para compilar pacotes do AUR ou com ABS, é necessário o grupo de pacotes base-devel."
_InstBse="Instalar pacotes Base"
_ChsInit="Choose your initsystem" # translate me !
_WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
_Note="Note!" # translate me !
_WarnOrc="These Manjaro profiles are incompatible with openrc:" # translate me !
_ChsAddPkgs="Choose additional modules for your kernels" # translate me !
_InstBootldr="Instalar o carregador do sistema"
_InstDrvTitle="Install Hardware Drivers" # translate me !

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

@ -24,7 +24,7 @@ _Lang="Язык"
_NoCon="Интернет не найден."
_EstCon="Установить соединение?"
_Config="Настроить"
_ApplySet=" Применяются настройки..."
_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 !
@ -340,7 +340,8 @@ _InstBsMenuTitle="Установка базовой системы"
_InstBseMenuBody="Устанавливаемые пакеты должны быть загружены с серверов-зеркал. Скрипт pacstrap устанавливает базовую систему. Для сборки пакетов из репозитория AUR или с помощью ABS, требуется установить группу пакетов base-devel."
_InstBse="Установка базовых пакетов"
_ChsInit="Choose your initsystem" # translate me !
_WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
_Note="Note!" # translate me !
_WarnOrc="These Manjaro profiles are incompatible with openrc:" # translate me !
_ChsAddPkgs="Choose additional modules for your kernels" # translate me !
_InstBootldr="Установить загрузчик"
_InstDrvTitle="Install Hardware Drivers" # translate me !

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

@ -24,7 +24,7 @@ _Lang="Language" # translate me !
_NoCon="No Internet Detected." # translate me !
_EstCon="Establish connection?" # translate me !
_Config="Configure" # translate me !
_ApplySet=" Applying settings ..." # 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 !
@ -340,7 +340,8 @@ _InstBsMenuTitle="Instalar sistema base"
_InstBseMenuBody="Los paquetes a instalar se deben descargar de los servidores mirror. El script 'pacstrap' instala el sistema base. Para compilar paquetes del AUR o con ABS, se requiere el grupo de paquetes 'base-devel'."
_InstBse="Instalar paquetes base"
_ChsInit="Choose your initsystem" # translate me !
_WarnOrc="Some manjaro editions like gnome are incompatible with openrc" # translate me !
_Note="Note!" # translate me !
_WarnOrc="These Manjaro profiles are incompatible with openrc:" # translate me !
_ChsAddPkgs="Choose additional modules for your kernels" # translate me !
_InstBootldr="Instalar gestor de arranque"
_InstDrvTitle="Install Hardware Drivers" # translate me !

2
lib/ini_val.sh
Unescape Escape View File

@ -58,7 +58,7 @@ function ini_val() {
echo "${key}${delim}${val}" >> "${file}"
else
# add to section
grep "^\[${section}\]" "${file}" || echo -e "\n[${section}]">>"${file}"
grep "^\[${section}\]" "${file}" &>/dev/null || echo -e "\n[${section}]">>"${file}"
sed -i -e "/\[${section}\]/a ${key}${delim}${val}" "${file}"
fi
else

51
lib/util-base.sh
Unescape Escape View File

@ -206,14 +206,14 @@ install_base() {
package_list=$PROFILES/shared/Packages-Root
echo "" > ${PACKAGES}
echo "" > ${ANSWER}
BTRF_CHECK=$(echo "btrfs-progs" "-" off)
F2FS_CHECK=$(echo "f2fs-tools" "-" off)
BTRF_CHECK=$(echo "btrfs-progs" "" off)
F2FS_CHECK=$(echo "f2fs-tools" "" off)
KERNEL="n"
mhwd-kernel -l | awk '/linux/ {print $2}' > /tmp/.available_kernels
kernels=$(cat /tmp/.available_kernels)
# User to select initsystem
DIALOG " $_ChsInit " --menu "\n$_WarnOrc\n " 0 0 2 \
DIALOG " $_ChsInit " --menu "\n$_Note\n$_WarnOrc\n$(evaluate_profiles)\n " 0 0 2 \
"1" "systemd" \
"2" "openrc" 2>${INIT}
@ -232,28 +232,23 @@ install_base() {
echo "" > /mnt/.base
# Choose kernel and possibly base-devel
DIALOG " $_InstBseTitle " --checklist "\n$_InstStandBseBody$_UseSpaceBar\n " 0 0 13 \
"base-devel" "-" off \
"yaourt + base-devel" "-" off \
$(cat /tmp/.available_kernels | awk '$0=$0" - off"') 2>${PACKAGES} || return 0
cat ${PACKAGES} | tr ' ' '\n' >> /mnt/.base
cat ${PACKAGES} | sed 's/+ \|\"//g' | tr ' ' '\n' >> /mnt/.base
check_for_error "selected: $(cat ${PACKAGES})"
if [[ $(cat ${PACKAGES}) == "" ]]; then
# Check to see if a kernel is already installed
ls ${MOUNTPOINT}/boot/*.img >/dev/null 2>&1
if [[ $? == 0 ]]; then
check_for_error "linux-$(ls ${MOUNTPOINT}/boot/*.img | cut -d'-' -f2) is already installed"
KERNEL="y"
DIALOG " kernel check " --msgbox "\nlinux-$(ls ${MOUNTPOINT}/boot/*.img | cut -d'-' -f2 | grep -v ucode.img) detected \n " 0 0
check_for_error "linux-$(ls ${MOUNTPOINT}/boot/*.img | cut -d'-' -f2) already installed"
else
for i in $(cat /tmp/.available_kernels); do
[[ $(cat ${PACKAGES} | grep ${i}) != "" ]] && KERNEL="y" && break;
done
fi
# If no kernel selected, warn and restart
if [[ $KERNEL == "n" ]]; then
DIALOG " $_ErrTitle " --msgbox "\n$_ErrNoKernel\n " 0 0
check_for_error "no kernel installed."
return 0
fi
else
fi
check_for_error "selected: $(cat ${PACKAGES})"
# Choose wanted kernel modules
@ -269,16 +264,16 @@ install_base() {
"KERNEL-virtualbox-guest-modules" "-" off \
"KERNEL-virtualbox-host-modules" "-" off \
"KERNEL-spl" "-" off \
"KERNEL-zfs" "-" off 2>/tmp/.modules
[[ $(cat /tmp/.modules) == "" ]] && return 0
"KERNEL-zfs" "-" off 2>/tmp/.modules || return 0
if [[ $(cat /tmp/.modules) != "" ]]; then
echo " " >> /mnt/.base
check_for_error "modules: $(cat /tmp/.modules)"
for kernel in $(cat ${PACKAGES} | grep -v "base-devel") ; do
for kernel in $(cat ${PACKAGES} | grep -vE '(yaourt|base-devel)'); do
cat /tmp/.modules | sed "s/KERNEL/\n$kernel/g" >> /mnt/.base
done
echo " " >> /mnt/.base
# If a selection made, act
if [[ $(cat ${PACKAGES}) != "" ]]; then
fi
clear
echo "" > /tmp/.desktop
filter_packages
@ -318,18 +313,12 @@ install_base() {
fi
# if branch was chosen, use that also in installed system. If not, use the system setting
if [[ -e ${BRANCH} ]]; then
sed -i "/Branch =/c\Branch = $(cat ${BRANCH})/" ${MOUNTPOINT}/etc/pacman-mirrors.conf 2>$ERR
check_for_error "set target branch $(cat ${BRANCH})" $?
else
sed -i "/Branch =/c\Branch = $(grep "Branch =" /etc/pacman-mirrors.conf)" ${MOUNTPOINT}/etc/pacman-mirrors.conf 2>$ERR
check_for_error "use host branch: $(grep "Branch =" /etc/pacman-mirrors.conf | cut -d' ' -f3)" $?
fi
[[ -z $(ini branch) ]] && ini branch $(ini system.branch)
sed -i "s/Branch =.*/Branch = $(ini branch)/;s/# //" ${MOUNTPOINT}/etc/pacman-mirrors.conf
touch /mnt/.base_installed
check_for_error "base installed succesfully."
install_network_drivers
fi
fi
}
install_bootloader() {
@ -419,8 +408,8 @@ DISABLED_FOR_NOW
# Grub auto-detects installed kernels, etc. Syslinux does not, hence the extra code for it.
bios_bootloader() {
DIALOG " $_InstBiosBtTitle " --menu "\n$_InstBiosBtBody\n " 0 0 2 \
"grub" "-" \
"grub + os-prober" "-" 2>${PACKAGES} || return 0
"grub" "" \
"grub + os-prober" "" 2>${PACKAGES} || return 0
clear
# If something has been selected, act
@ -654,7 +643,7 @@ create_new_user() {
done
shell=""
DIALOG " _NUsrTitle " --radiolist "\n$_DefShell\n$_UseSpaceBar\n " 0 0 3 \
DIALOG " $_NUsrTitle " --radiolist "\n$_DefShell\n$_UseSpaceBar\n " 0 0 3 \
"zsh" "-" on \
"bash" "-" off \
"fish" "-" off 2>/tmp/.shell

4
lib/util-disk.sh
Unescape Escape View File

@ -312,7 +312,7 @@ mount_opts() {
FS_OPTS="${FS_OPTS} ${i} - off"
done
DIALOG " $(echo $FILESYSTEM | sed "s/.*\.//g" | sed "s/-.*//g") " --checklist "\n$_btrfsMntBody\n " 0 0 \
DIALOG " $(echo $FILESYSTEM | sed "s/.*\.//g;s/-.*//g") " --checklist "\n$_btrfsMntBody\n " 0 0 \
$CHK_NUM $FS_OPTS 2>${MOUNT_OPTS}
# Now clean up the file
@ -858,7 +858,7 @@ mount_partitions() {
DIALOG " $_PrepMntPart " --yesno "\n$_FormUefiBody $PARTITION $_FormUefiBody2\n " 0 0 && {
mkfs.vfat -F32 ${PARTITION} >/dev/null 2>$ERR
check_for_error "mkfs.vfat -F32 ${PARTITION}" "$?"
}
} || return 0
else
mkfs.vfat -F32 ${PARTITION} >/dev/null 2>$ERR
check_for_error "mkfs.vfat -F32 ${PARTITION}" "$?"

17
lib/util.sh
Unescape Escape View File

@ -43,6 +43,7 @@ PACKAGES="/tmp/.pkgs" # Packages to install
MOUNT_OPTS="/tmp/.mnt_opts" # Filesystem Mount options
INIT="/tmp/.init" # init systemd|openrc
ERR="/tmp/.errlog"
BRANCH="/tmp/.branch"
# Installer-Log
LOGFILE="/var/log/m-a.log" # path for the installer log in the live environment
@ -173,6 +174,9 @@ id_system() {
[[ $H_INIT == "systemd" ]] && [[ $(systemctl is-active NetworkManager) == "active" ]] && NW_CMD=nmtui 2>$ERR
check_for_error "system: $SYSTEM, init: $H_INIT nw-client: $NW_CMD"
# evaluate host branch
ini system.branch "$(grep -oE -m 1 "unstable|stable|testing" /etc/pacman.d/mirrorlist)"
}
# If there is an error, display it and go back to main menu. In any case, write to logfile.
@ -387,16 +391,15 @@ configure_mirrorlist() {
rank_mirrors() {
#Choose the branch for mirrorlist
BRANCH="/tmp/.branch"
DIALOG " $_MirrorBranch " --radiolist "\n$_UseSpaceBar\n " 0 0 3 \
"stable" "-" on \
"testing" "-" off \
"unstable" "-" off 2>${BRANCH}
"unstable" "-" off 2>${ANSWER}
local branch="$(<{ANSWER})"
clear
if [[ ! -z "$(cat ${BRANCH})" ]]; then
pacman-mirrors -gib "$(cat ${BRANCH})"
check_for_error "$FUNCNAME branch $(cat ${BRANCH})"
ini branch "$BRANCH"
if [[ ! -z ${branch} ]]; then
pacman-mirrors -gib "${branch}"
ini branch "${branch}"
fi
}
@ -509,7 +512,7 @@ final_check() {
exit_done() {
if [[ $(lsblk -o MOUNTPOINT | grep ${MOUNTPOINT} 2>/dev/null) != "" ]]; then
final_check
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "\n$_CloseInstBody $(cat ${CHECKLIST})\n " 0 0
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "$(printf "\n$_CloseInstBody\n$(cat ${CHECKLIST})\n ")" 0 0
if [[ $? -eq 0 ]]; then
check_for_error "exit installer."
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "\n$_LogInfo ${TARGLOG}\n " 0 0

Write Preview
Loading…
Cancel
Save