From 6702ff2fa35c2af62fd89eab8a1a46176c4bb5b8 Mon Sep 17 00:00:00 2001 From: khvalera Date: Tue, 5 Sep 2023 10:41:22 +0300 Subject: [PATCH] v 0.0.32 --- install-partition.func | 4 +- install-snuglinux | 4 +- install-snuglinux.messages | 200 ++++++++++++++++++------------------- 3 files changed, 103 insertions(+), 105 deletions(-) diff --git a/install-partition.func b/install-partition.func index 3e2778c..9c753af 100644 --- a/install-partition.func +++ b/install-partition.func @@ -60,7 +60,7 @@ install_grub_bios(){ local STR_READ AMSURE OK OK=0 - install_pkg "grub-sl" "y" + install_pkg "grub" "y" while [ "${OK}" = 0 ] ; do STR_READ=`show_message SPECIFY_PARTITION_INSTALL "grub" "/dev/sda"` read -p "${STR_READ}" AMSURE @@ -95,7 +95,7 @@ install_grub_uefi(){ STR_READ=`show_message UEFI_DIRECTORY_DOES_NOT_EXIST $DIR_CHROOT/boot/efi` return 1 fi - install_pkg "grub-sl" "y" + install_pkg "grub" "y" install_pkg "efibootmgr" "y" OK=0 diff --git a/install-snuglinux b/install-snuglinux index b329c57..c94acce 100755 --- a/install-snuglinux +++ b/install-snuglinux @@ -15,6 +15,8 @@ else source ${PO_DIR}/install-snuglinux.func fi +system_language + # install-partition.func if [ -f "${PO_DIR}/install-partition.func" ]; then source "${PO_DIR}/install-partition.func" @@ -31,8 +33,6 @@ else exit 1 fi -system_language - set_options $* if [[ $EUID -ne 0 ]]; then diff --git a/install-snuglinux.messages b/install-snuglinux.messages index 35eba72..4955503 100644 --- a/install-snuglinux.messages +++ b/install-snuglinux.messages @@ -1,14 +1,12 @@ #! /bin/bash -lang=`echo $LANG | cut -b 1,2`; - show_message() { case $1 in ############## SHOW_USAGE)############################################################ ############## -case $lang in +case $LANG_SELECT in ru) cat <