v 0.0.27

snuglinux · May 1, 2022 · 94e1685 · 94e1685
1 parent bca9710
commit 94e1685
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/install-snuglinux b/install-snuglinux
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-CURRENT_VERSION=0.0.22
+CURRENT_VERSION=0.0.0
 INSTALL_PREFIX=/usr
 PO_DIR=${INSTALL_PREFIX}/share/snuglinux
 
@@ -40,8 +40,6 @@ if [[ $EUID -ne 0 ]]; then
    exit 1
 fi
 
-pacman -Sy
-
 ping_server
 if [ "$?" = 1 ]; then
    exit 1;
@@ -51,10 +49,10 @@ edit_pacman_conf "/etc";
 
 edit_pacman_mirrorlist "/etc";
 
-download_updates_func;
-
 checking_installed_packages;
 
+download_updates_func;
+
 select_type;
 
 preparation_disk;

diff --git a/install-snuglinux.func b/install-snuglinux.func
@@ -77,7 +77,7 @@ system_language() {
         return 1
      fi
      echo -e "LANG=${LANG_UTF8}" > ${PATH_FILE}/etc/locale.conf
-     #echo -e "KEYMAP=${LANG_SELECT}\nFONT=cyr-sun16\nFONT_MAP=" > ${PATH_FILE}/etc/vconsole.conf
+     echo -e "KEYMAP=${LANG_SELECT}\nFONT=cyr-sun16\nFONT_MAP=" > ${PATH_FILE}/etc/vconsole.conf
      sed -i ${PATH_FILE}/etc/locale.gen -e "s|#\(en_US.UTF-8 UTF-8\)|\1|"
      sed -i ${PATH_FILE}/etc/locale.gen -e "s|#\(${LANG_UTF8} UTF-8\)|\1|"
      #sed -i ${PATH_FILE}/etc/locale.gen -e 's|#\(ru_RU.UTF-8 UTF-8\)|\1|'
@@ -777,6 +777,7 @@ install_basic_packages(){
          exit 1;
       fi
    fi
+   chroot ${DIR_CHROOT} pacman -Sy
 }
 
 #=======================================
@@ -894,6 +895,7 @@ select_arm_type() {
 #=======================================
 checking_installed_packages(){
    local ARM_PKG NOT_INSTALL_PKG
+   pacman -Sy
    if [[ "$INSTALL_ARCH" == "arm" ]] && [[ $(uname -m) == "x86_64" ]] ; then
       ARM_PKG="binfmt-qemu-static-sl";
    fi