From 3b6e6b6e206acc9645f13f80143321b4b050932e Mon Sep 17 00:00:00 2001 From: Dustin Falgout Date: Fri, 17 Jun 2016 00:07:57 -0500 Subject: [PATCH] all commits up until this point make up what fixes antergos/antergos-iso#62 --- iso-hotfix-utility | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/iso-hotfix-utility b/iso-hotfix-utility index 0e65c74..d28c942 100644 --- a/iso-hotfix-utility +++ b/iso-hotfix-utility @@ -114,7 +114,6 @@ font_patch() { if [[ 'True' = "${clear_fcache}" ]]; then sudo fc-cache -f -v fi - } @@ -134,12 +133,6 @@ start_cnchi() { } -notify_no_updates() { - notify_user "${NO_UPDATES_CN}" "${NO_UPDATES_CN_SUB}" - sudo sed -i '1d' /etc/pacman.d/antergos-mirrorlist -} - - wait_for_internet_connection() { if [[ "${NETWORK_ALIVE}" != 0 ]]; then start_cnchi @@ -169,6 +162,12 @@ add_or_remove_antbs_mirrorlist() { } +notify_no_updates() { + notify_user "${NO_UPDATES_CN}" "${NO_UPDATES_CN_SUB}" + add_or_remove_antbs_mirrorlist 'remove' +} + + populate_pacman_keyring() { { packey_populate && return 0; } || \ { packey_init && packey_populate && return 0; } || \ @@ -227,6 +226,11 @@ run_when_connected() { ## ### +for supplemental_file in /etc/iso-hotfix-utility.d/** +do + source "${supplemental_file}" +done + if [[ "$1" = cnchi-dev ]]; then sudo rm -rf /usr/share/cnchi sudo git clone https://github.com/lots0logs/cnchi-dev.git /usr/share/cnchi