fixes #9 (and other stuff i discovered)

pull/3/head
Matt C 3 years ago
parent bd736b5920
commit 26bc5365cd

@ -1,7 +1,7 @@
# Maintainer: Matt C <mdc028[at]bucknell[dot]edu> # Maintainer: Matt C <mdc028[at]bucknell[dot]edu>
pkgname=citrine pkgname=citrine
pkgver=3.2.5 pkgver=3.2.6
pkgrel=1 pkgrel=1
pkgdesc="Crystal Linux Script for installing the system" pkgdesc="Crystal Linux Script for installing the system"
arch=('any') arch=('any')
@ -10,7 +10,7 @@ license=('custom')
source=("citrine.sh" "citrine.internal.sh") source=("citrine.sh" "citrine.internal.sh")
depends=('arch-install-scripts' 'util-linux' 'parted' 'dialog' 'dosfstools' 'ntp') depends=('arch-install-scripts' 'util-linux' 'parted' 'dialog' 'dosfstools' 'ntp')
md5sums=('c16f9c01d656886b905071cb5477d3e3' md5sums=('c16f9c01d656886b905071cb5477d3e3'
'a2deb9b83adf9d727b7aaa67414f08df') '1222056ce25a2f5c31fc074ae46aa7af')
package() { package() {
chmod +x *.sh chmod +x *.sh

@ -64,7 +64,7 @@ echo "PMODE=$yn"
PMODE="$yn" PMODE="$yn"
dumptitle="System Disks" dumptitle="System Disks"
diskdat="$(fdisk -l | grep Disk | grep sectors --color=never)" diskdat="$(fdisk -l | grep Disk | grep sectors --color=never | grep -v loop)"
dump "$diskdat" dump "$diskdat"
MANUAL="no" MANUAL="no"
@ -344,8 +344,8 @@ arch-chroot pacman-key --populate crystal
clear clear
mkdir -p /mnt/etc/
cp -v /etc/pacman.conf /mnt/etc/pacman/. cp -v /etc/pacman.conf /mnt/etc/pacman/.
read
arch-chroot /mnt pacman -Sy --quiet --noconfirm arch-chroot /mnt pacman -Sy --quiet --noconfirm
@ -447,24 +447,11 @@ if [[ "$flatpak" == "0" ]]; then
dump "Adding the flathub remote likely failed. We're sorry we can't work around this. Ask in discord if you need help." dump "Adding the flathub remote likely failed. We're sorry we can't work around this. Ask in discord if you need help."
fi fi
yesno "Would you like to add more packages? (Y/n)"
MP="$yn"
if [[ "$MP" != "1" ]]; then
yesno "Would you like to use a URL to a package list? (Y/n)"
OL="$yn"
if [[ "$OL" == "1" ]]; then
msgbox "Write package names"
PKGNS="$msgdat"
inf "Installing: $PKGNS"
arch-chroot /mnt "pacman -S --quiet --noconfirm $PKGNS"
else
msgbox "URL to package list"
SRC="$msgdat"
PKGS="$(curl ${SRC})"
for PKG in PKGS; do
arch-chroot /mnt pacman -S --quiet --noconfirm $PKG
done
fi
fi
inf "Installation should now be complete." inf "Installation should now be complete."
yesno "Would you like to chroot into the new install to configure manually? (y/N)"
CH="$yn"
if [[ "$CH" = "0" ]]; then
inf "Use 'exit' when done."
arch-chroot /mnt
fi
Loading…
Cancel
Save