diff options
Diffstat (limited to 'install.sh')
-rwxr-xr-x | install.sh | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -3,7 +3,7 @@ if [ $(id -u) -ne 0 ] then echo "Please run as root" exit fi -SCRIPTPATH=$(dirname "$(readlink -f "$0")") +export SCRIPTPATH=$(dirname "$(readlink -f "$0")") if [ -z $1 ]; then echo "Which drive?" read DRIVE @@ -18,11 +18,11 @@ xargs -n1 echo | sed 1q | rev | cut -c 2- | rev ))" umount $DRIVE* if [ ! -e installed ]; then - parted $DRIVE mklabel gpt - parted $DRIVE mkpart fat32 0 512M - parted $DRIVE set 1 esp on - parted $DRIVE mkpart ext4 512M -30G - parted $DRIVE mkpart ntfs -30G -0 + parted $DRIVE -- mklabel gpt + yes ignore | parted $DRIVE -- mkpart fat32 0 512M + parted $DRIVE -- set 1 esp on + yes ignore | parted $DRIVE -- mkpart ext4 512M -30G + parted $DRIVE -- mkpart ntfs -30G -0 yes | mkfs.vfat ${PART}1 yes | mkfs.ntfs ${PART}3 cryptsetup luksFormat ${PART}2 @@ -41,7 +41,8 @@ if [ ! -e installed ]; then pacstrap /mnt base || exit 1 genfstab -U /mnt >> /mnt/etc/fstab - cp -r . /mnt + + sudo install -d . /mnt/root/dotfiles sed "s|%%UUID%%|$(blkid ${PART}2)|" src/etc/default/grub.orig > src/etc/default/grub touch installed else @@ -50,7 +51,6 @@ else mount ${PART}1 /mnt/efi fi arch-chroot /mnt << EOF - cd dotfiles - sh build.sh + sh /root/dotfiles/build.sh EOF echo "DONE! You should set passwords, move around ssh keys, etc." |