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

fix: echo - outputs -

Browse Source
This commit is contained in:
ange 2024-05-25 17:29:05 +02:00
parent e06284ca50
commit 5355b3eca2
Signed by: ange
GPG Key ID: 9E0C4157BB7BEB1D
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config
View File

@ -10,8 +10,8 @@ disk_passwd=cryptroot
swapfile=1024 # MiB swapfile=1024 # MiB
username=ange username=ange
user_passwd=ange userpasswd=ange
root_passwd=root rootpasswd=root
shell=zsh shell=zsh

2
modules/chroot/00-bootstrap.sh
View File

@ -11,4 +11,4 @@ locale-gen
echo "LANG=$lang.UTF-8" > /etc/locale.conf echo "LANG=$lang.UTF-8" > /etc/locale.conf
echo - "$hostname" > /etc/hostname echo "$hostname" > /etc/hostname

4
modules/chroot/20-users.sh
View File

@ -4,5 +4,5 @@
shell="$(sed -n "/$shell/{p;q}" /etc/shells)" shell="$(sed -n "/$shell/{p;q}" /etc/shells)"
useradd -mG wheel,video "$username" -s "${shell:-/bin/bash}" useradd -mG wheel,video "$username" -s "${shell:-/bin/bash}"
echo "root:$root_passwd" | chpasswd echo "root:$rootpasswd" | chpasswd
echo - "$username:$user_passwd" | chpasswd echo "$username:$userpasswd" | chpasswd

6
modules/desktop.sh
View File

@ -34,10 +34,10 @@ printf '%s\n' \
>> flatpak.txt >> flatpak.txt
case "$(lspci | grep 'VGA\|3D')" in case "$(lspci | grep 'VGA\|3D')" in
*AMD*) echo vulkan-radeon >> pkglist.txt ;; *AMD*) echo vulkan-radeon >> pkglist.txt ;;
*Intel*) echo vulkan-intel >> pkglist.txt ;; *Intel*) echo vulkan-intel >> pkglist.txt ;;
*NVIDIA*) echo vulkan-nouveau >> pkglist.txt ;; *NVIDIA*) echo vulkan-nouveau >> pkglist.txt ;;
*) ;; *) ;;
esac esac
find ./modules/ -name '*.sh.desktop' -exec rename '.desktop' '' '{}' + find ./modules/ -name '*.sh.desktop' -exec rename '.desktop' '' '{}' +

6
modules/postchroot/99-done.sh
View File

@ -5,11 +5,11 @@ BOLD=$'\e[1m'
GREEN=$'\e[32m' GREEN=$'\e[32m'
NORMAL=$'\e[0m' NORMAL=$'\e[0m'
echo -e "${BOLD}${GREEN}DONE. Umount? [Y/n]${NORMAL} " && read -r ANS echo "${BOLD}${GREEN}DONE. Umount? [Y/n]${NORMAL} " && read -r ANS
case "$ANS" in case "$ANS" in
[Yy]*) ;; ''|[Yy]*) ;;
*) exit ;; *) exit ;;
esac esac
awk '/mnt/ {print $1}' < /proc/swaps | xargs swapoff awk '/mnt/ {print $1}' < /proc/swaps | xargs swapoff

2
modules/prechroot/10-disk.sh
View File

@ -10,7 +10,7 @@ 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 -n - "$disk_passwd" | cryptsetup luksFormat "$root" - echo -n "$disk_passwd" | cryptsetup luksFormat "$root" -
cryptsetup open "$root" cryptroot - <<< "$disk_passwd" cryptsetup open "$root" cryptroot - <<< "$disk_passwd"
root=/dev/mapper/cryptroot root=/dev/mapper/cryptroot
} }