ange/archinstall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: typos

Browse Source
This commit is contained in:
ange 2024-05-25 11:21:55 +02:00
parent 5cc6a0dd08
commit 2f3664acaa
Signed by: ange
GPG Key ID: 9E0C4157BB7BEB1D
6 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -2,10 +2,11 @@
My personal Arch install script. My personal Arch install script.
## HOW-TO ## HOW-TO
Clone the script, edit the `config` file to match your preferences and run the Install git, clone the script, edit the `config` file to match your preferences
`install.sh` script. and run the `install.sh` script.
```bash ```bash
pacman -Sy git
git clone https://git.maby.dev/ange/archinstall.git git clone https://git.maby.dev/ange/archinstall.git
cd archinstall cd archinstall
$EDITOR config $EDITOR config

3
install.sh
View File

@ -4,4 +4,5 @@ set -a
. ./config . ./config
set +a set +a
./modules/"$install_type".sh # cp chroot?
bash ./modules/"$install_type".sh

12
modules/00-prechroot/10-disk.sh
View File

@ -10,15 +10,17 @@ boot=/dev/disk/by-partlabel/boot
root=/dev/disk/by-partlabel/root root=/dev/disk/by-partlabel/root
[ -n "$disk_passwd" ] && { [ -n "$disk_passwd" ] && {
echo "$disk_passwd" | cryptsetup luksFormat "$root" - echo -n "$disk_passwd" | cryptsetup luksFormat "$root" -
echo "$disk_passwd" | cryptsetup open "$root" cryptroot - cryptsetup open "$root" cryptroot - <<< "$disk_passwd"
root=/dev/mapper/cryptroot root=/dev/mapper/cryptroot
} }
mkfs.vfat -F32 "$boot" sleep 2 # wait for /dev/disk/by-partlabel/ to be populated
mkfs.ext4 "$root"
mkfs.fat -F32 "$boot"
mkfs.ext4 -F "$root"
mount "$root" /mnt/ mount "$root" /mnt/
mount -mo fmask=0077,dmask=0077 /dev/disk/by-partlabel/boot /mnt/boot/ mount -m -o fmask=0077,dmask=0077 /dev/disk/by-partlabel/boot /mnt/boot/
[ -n "$swapfile" ] && { [ -n "$swapfile" ] && {
dd if=/dev/zero of=/mnt/swapfile bs=1M count="$swapfile" status=progress dd if=/dev/zero of=/mnt/swapfile bs=1M count="$swapfile" status=progress

2
modules/00-prechroot/20-pkg.sh
View File

@ -13,3 +13,5 @@ esac
pacstrap -C rootfs/etc/pacman.conf -K /mnt/ \ pacstrap -C rootfs/etc/pacman.conf -K /mnt/ \
base linux{,-lts,-firmware} "$shell" "${pkg[@]}" base linux{,-lts,-firmware} "$shell" "${pkg[@]}"
find /mnt/etc -name '*.pacnew' -delete

2
modules/desktop.sh
View File

@ -40,6 +40,6 @@ case "$(lspci | grep 'VGA\|3D')" in
*) ;; *) ;;
esac esac
./modules/base.sh bash ./modules/base.sh
xdg-user-dirs-update xdg-user-dirs-update

4
modules/dwm.sh
View File

@ -22,7 +22,7 @@ case "$(lsmod)" in
;; ;;
esac esac
./modules/desktop.sh bash ./modules/desktop.sh
git clone --depth 1 https://git.maby.dev/ange/.dotfiles.git dotfiles git clone --depth 1 https://git.maby.dev/ange/.dotfiles.git dotfiles
arch-chroot ./dotfiles/.config/suckless/update.sh arch-chroot /mnt/ bash -x ./dotfiles/.config/suckless/update.sh