@ -1,3 +1,15 @@
# !/bin/bash
#
# Architect Installation Framework (version 2.3.1 - 26-Mar-2016)
#
# Written by Carl Duff for Architect Linux
#
# Modified by Chrysostomus to install manjaro instead
#
# This program is free software, provided under the GNU General Public License
# as published by the Free Software Foundation. So feel free to copy, distribute,
# or modify it as you wish.
# Header
# Header
VERSION = " Manjaro Architect Installer v $version "
VERSION = " Manjaro Architect Installer v $version "
@ -29,6 +41,10 @@ PACKAGES="/tmp/.pkgs" # Packages to install
MOUNT_OPTS = "/tmp/.mnt_opts" # Filesystem Mount options
MOUNT_OPTS = "/tmp/.mnt_opts" # Filesystem Mount options
INIT = "/tmp/.init" # init systemd|openrc
INIT = "/tmp/.init" # init systemd|openrc
# Installer-Log
LOGFIlE = "/var/log/m-a.log"
[ [ -e $LOGFILE ] ] && touch $LOGFILE
# file systems
# file systems
BTRFS = 0
BTRFS = 0
LUKS = 0
LUKS = 0
@ -80,6 +96,10 @@ import(){
fi
fi
}
}
LOG( ) {
echo " $( date +%D-%T%Z) : $1 " >> $LOGFILE
}
DIALOG( ) {
DIALOG( ) {
dialog --backtitle " $VERSION - $SYSTEM ( $ARCHI ) " --column-separator "|" --title " $@ "
dialog --backtitle " $VERSION - $SYSTEM ( $ARCHI ) " --column-separator "|" --title " $@ "
}
}
@ -112,7 +132,7 @@ id_system() {
fi
fi
SYSTEM = "UEFI"
SYSTEM = "UEFI"
else
else
SYSTEM = "BIOS"
SYSTEM = "BIOS"
fi
fi
# init system
# init system
@ -131,6 +151,7 @@ check_for_error() {
if [ [ $? -eq 1 ] ] && [ [ $( cat /tmp/.errlog | grep -i "error" ) != "" ] ] ; then
if [ [ $? -eq 1 ] ] && [ [ $( cat /tmp/.errlog | grep -i "error" ) != "" ] ] ; then
DIALOG " $_ErrTitle " --msgbox " $( cat /tmp/.errlog) " 0 0
DIALOG " $_ErrTitle " --msgbox " $( cat /tmp/.errlog) " 0 0
mv /tmp/.errlog /tmp/.errlog0
mv /tmp/.errlog /tmp/.errlog0
main_menu_online
main_menu_online
fi
fi
}
}