kneesox/easy-arch
1
0
Fork 0
mirror of https://github.com/classy-giraffe/easy-arch.git synced 2025-11-17 11:30:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix unescaped quotes, etc for syntax check

Browse source
This commit is contained in:
i-c-u-p 2022-04-29 05:11:52 +00:00
parent 632d40c5c5
commit c06241dc46
No known key found for this signature in database
GPG key ID: ABB80C12170FC0D1
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
easy-arch.sh
View file

@ -196,7 +196,7 @@ hostname_selector () {
# User chooses the locale (function).
locale_selector () {
read -r -p "Please insert the locale you use (format: xx_XX. Enter empty to use en_US, or "/" to search locales): " locale
read -r -p "Please insert the locale you use (format: xx_XX. Enter empty to use en_US, or \"/\" to search locales): " locale
case $locale in
'') print "en_US will be used as default locale."
locale="en_US.UTF-8";;
@ -213,7 +213,7 @@ locale_selector () {
# User chooses the console keyboard layout (function).
keyboard_selector () {
read -r -p "Please insert the keyboard keymap/layout to use in console (enter empty to use us, or "/" to search keymaps): " kblayout
read -r -p "Please insert the keyboard keymap/layout to use in console (enter empty to use us, or \"/\" to search keymaps): " kblayout
case $kblayout in
'') print "The us keymap will be used in console by default."
kblayout="us"
@ -221,7 +221,7 @@ keyboard_selector () {
'/') localectl list-keymaps
clear
return 1;;
*) if ! $(localectl list-keymaps | grep -Fxq $kblayout); then
*) if ! localectl list-keymaps | grep -Fxq $kblayout; then
incEcho "The specified keymap doesn't exist."
return 1
fi
@ -313,8 +313,8 @@ mount $BTRFS /mnt
# Creating BTRFS subvolumes.
print "Creating BTRFS subvolumes."
subvols=(snapshots var_pkgs var_log home root srv)
for subvol in '' ${subvols[@]}; do
btrfs su cr /mnt/@$subvol
for subvol in '' "${subvols[@]}"; do
btrfs su cr /mnt/@"$subvol"
done
# Mounting the newly created subvolumes.
@ -323,8 +323,8 @@ print "Mounting the newly created subvolumes."
mountopts="ssd,noatime,compress-force=zstd:3,discard=async"
mount -o $mountopts,subvol=@ $BTRFS /mnt
mkdir -p /mnt/{home,root,srv,.snapshots,var/{log,cache/pacman/pkg},boot}
for subvol in ${subvols[@]:2}; do # ":2" excludes first two subvols (@snapshots and @var_pkgs) from loop
mount -o $mountopts,subvol=@$subvol $BTRFS /mnt/$(sed 's,_,/,g' <<< $subvol)
for subvol in "${subvols[@]:2}"; do # ":2" excludes first two subvols (@snapshots and @var_pkgs) from loop
mount -o "$mountopts",subvol=@"$subvol" "$BTRFS" /mnt/$(sed 's,_,/,g' <<< "$subvol")
done
chmod -R 750 /mnt/root
mount -o $mountopts,subvol=@snapshots $BTRFS /mnt/.snapshots