merge-requests/260/head
Bernhard Landauer 7 years ago
parent 86f8c836b2
commit 6ac8e30753

@ -7,8 +7,7 @@ DATADIR = /share/manjaro-architect
BIN = \
bin/btrfs-subvol-functions \
bin/ma-launcher \
bin/manjaro-architect \
bin/setup
bin/manjaro-architect
LIBS = \
lib/util.sh \

@ -0,0 +1,28 @@
#!/bin/sh
if [ $(cat /proc/1/comm) == "systemd" ]; then
H_INIT="systemd"
fi
while [[ ! $(ping -c 2 manjaro.org) ]]; do
if [[ $(cat /proc/1/comm) == "systemd" ]];then
if [[ $(systemctl is-active NetworkManager) == "active" ]]; then
dialog --backtitle ":: Manjaro Architect ::" --yesno "\nPlease connect to the internet:\n" 0 0 && \
clear && nmtui && continue || \
clear && exit 0
else
dialog --backtitle ":: Manjaro Architect ::" --title " Error: " --msgbox "\nNo network service detected!\nquitting." 0 0 && \
clear && exit 0
fi
else
dialog --title " Error: " --msgbox "\nAn active internet connection is needed!\n" 0 0 && \
clear && exit 0
fi
done
echo "updating the installer ..."
sleep 1
sudo pacman -Sy manjaro-architect --noconfirm
echo "launching Manjaro Architect ..."
sudo manjaro-architect

@ -1,4 +0,0 @@
#!/bin/sh
sudo manjaro-architect

@ -158,7 +158,7 @@ config_base_menu() {
local PARENT="$FUNCNAME"
# Set the default PATH variable
arch_chroot "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/core_perl" 2>/tmp/.errlog
arch_chroot "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/core_perl" 2>$ERR
check_for_error
submenu 8
@ -278,7 +278,7 @@ install_acc_menu() {
clear
# If something has been selected, install
if [[ $(cat ${PACKAGES}) != "" ]]; then
basestrap ${MOUNTPOINT} ${PACKAGES} 2>/tmp/.errlog
basestrap ${MOUNTPOINT} ${PACKAGES} 2>$ERR
check_for_error
fi

Loading…
Cancel
Save