diff --git a/PKGBUILD b/PKGBUILD index 77fb0ee..d2f2d82 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,14 +1,14 @@ # Maintainer: Matt C pkgname=citrine -pkgver=3.2.4 +pkgver=3.2.5 pkgrel=1 pkgdesc="Crystal Linux Script for installing the system" arch=('any') url="https://git.tar.black/crystal/programs/citrine" license=('custom') source=("citrine.sh" "citrine.internal.sh") -depends=('arch-install-scripts' 'util-linux' 'parted' 'dialog' 'btrfs-progs' 'dosfstools') +depends=('arch-install-scripts' 'util-linux' 'parted' 'dialog' 'dosfstools' 'ntp') md5sums=('c16f9c01d656886b905071cb5477d3e3' 'a2deb9b83adf9d727b7aaa67414f08df') diff --git a/citrine.internal.sh b/citrine.internal.sh index 456af72..ac20062 100755 --- a/citrine.internal.sh +++ b/citrine.internal.sh @@ -172,6 +172,10 @@ else DISK="${msgdat}" fi + dumptitle="Suggestion" + dump "You could also use the graphical 'Disks' application. This will take care of everything except mounting, which you will\ + still need to do within the shell." + CONFDONE="NOPE" dumptitle="Citrine" @@ -202,6 +206,8 @@ if [[ ! "$?" == "0" ]]; then exit 1 fi +ntpd -g -q + inf "Setting up base Crystal System" pacstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager man-db man-pages texinfo micro sudo curl archlinux-keyring neofetch which @@ -447,13 +453,13 @@ if [[ "$MP" != "1" ]]; then msgbox "Write package names" PKGNS="$msgdat" inf "Installing: $PKGNS" - arch-chroot /mnt su - ${UN} -c "ame -S ${PKGNS}" + arch-chroot /mnt su - ${UN} -c "ame ins ${PKGNS}" else msgbox "URL to package list" SRC="$msgdat" PKGS="$(curl ${SRC})" for PKG in PKGS; do - arch-chroot /mnt su - ${UN} -c "ame -S ${PKG}" + arch-chroot /mnt su - ${UN} -c "ame ins ${PKG}" done fi fi