Skip to content
Snippets Groups Projects
Commit 9efae8d2 authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

do not synchronize at glibc update, reorganize order of function call

parent 1f5ff462
No related branches found
No related tags found
No related merge requests found
......@@ -104,12 +104,12 @@ check_database(){
fi
}
check_pacman_keyring(){
check_keyring(){
# always udpate the host keyring
pacman -S archlinux-keyring --noconfirm --needed || die "unable to update pacman-keyring" "clean_install"
pacman -S archlinux-keyring obarun-keyring --noconfirm --needed || die "unable to update pacman-keyring" "clean_install"
}
hot_fix()
check_glibc_ver()
{
if [[ -d /run/archiso/sfs/airootfs/ ]];then
run_cmd check_gpg "${GPG_DIR}"
......@@ -117,7 +117,7 @@ hot_fix()
local=$(expac -Q %v glibc --config "$GENERAL_DIR/$CONFIG_DIR/pacman.conf")
if vercmp ${remote} ${local} >&/dev/null; then
oblog -t "Updating glibc package"
pacman -Sy glibc --noconfirm --config "$GENERAL_DIR/$CONFIG_DIR/pacman.conf"
pacman -S glibc --noconfirm --config "$GENERAL_DIR/$CONFIG_DIR/pacman.conf"
fi
fi
}
......@@ -136,13 +136,19 @@ if [[ "$NETWORKCHECK" == "yes" ]]; then
check_network
run_cmd sed -i "s,^NETWORKCHECK=.*$,NETWORKCHECK=\"no\"," "${CONFIG}"
fi
check_database
hot_fix
main_update
check_pacman_keyring
check_database
check_glibc_ver
check_keyring
dg_info "Welcome to the obarun installer" "$dgm_welcome"
if [[ "$KEYBOARDCHECK" == "yes" ]]; then
set_keymap
run_cmd sed -i "s,^KEYBOARDCHECK=.*$,KEYBOARDCHECK=\"no\"," "${CONFIG}"
fi
main_menu
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment