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

fix indentation of password selection functions

Browse source 
made the indentation on the password selection functions more consistent and use 4 spaces per indent instead of a literal tab character.
This commit is contained in:
i-c-u-p 2022-04-26 07:54:53 +00:00 • committed by GitHub
parent 3df93905c4
commit 576912e9ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

84
easy-arch.sh
View file

@ -104,20 +104,20 @@ network_selector () {
# Setting up a password for the LUKS Container (function). # Setting up a password for the LUKS Container (function).
lukspass_selector () { lukspass_selector () {
while true; do while true; do
read -r -s -p "Insert password for the LUKS container (you're not going to see the password): " password read -r -s -p "Insert password for the LUKS container (you're not going to see the password): " password
while [ -z "$password" ]; do while [ -z "$password" ]; do
echo echo
print "You need to enter a password for the LUKS Container in order to continue." print "You need to enter a password for the LUKS Container in order to continue."
read -r -s -p "Insert password for the LUKS container (you're not going to see the password): " password read -r -s -p "Insert password for the LUKS container (you're not going to see the password): " password
[ -n "$password" ] && break [ -n "$password" ] && break
done done
echo echo
read -r -s -p "Password (again): " password2 read -r -s -p "Password (again): " password2
echo echo
[ "$password" = "$password2" ] && break [ "$password" = "$password2" ] && break
echo "Passwords don't match, try again." echo "Passwords don't match, try again."
done done
echo -n "$password" | cryptsetup luksFormat "$CRYPTROOT" -d - echo -n "$password" | cryptsetup luksFormat "$CRYPTROOT" -d -
echo -n "$password" | cryptsetup open "$CRYPTROOT" cryptroot -d - echo -n "$password" | cryptsetup open "$CRYPTROOT" cryptroot -d -
BTRFS="/dev/mapper/cryptroot" BTRFS="/dev/mapper/cryptroot"
@ -125,38 +125,38 @@ lukspass_selector () {
# Setting up a password for the user account (function). # Setting up a password for the user account (function).
userpass_selector () { userpass_selector () {
while true; do while true; do
read -r -s -p "Set a user password for $username: " userpass read -r -s -p "Set a user password for $username: " userpass
while [ -z "$userpass" ]; do while [ -z "$userpass" ]; do
echo echo
print "You need to enter a password for $username." print "You need to enter a password for $username."
read -r -s -p "Set a user password for $username: " userpass read -r -s -p "Set a user password for $username: " userpass
[ -n "$userpass" ] && break [ -n "$userpass" ] && break
done done
echo echo
read -r -s -p "Insert password again: " userpass2 read -r -s -p "Insert password again: " userpass2
echo echo
[ "$userpass" = "$userpass2" ] && break [ "$userpass" = "$userpass2" ] && break
echo "Passwords don't match, try again." echo "Passwords don't match, try again."
done done
} }
# Setting up a password for the root account (function). # Setting up a password for the root account (function).
rootpass_selector () { rootpass_selector () {
while true; do while true; do
read -r -s -p "Set a root password: " rootpass read -r -s -p "Set a root password: " rootpass
while [ -z "$rootpass" ]; do while [ -z "$rootpass" ]; do
echo echo
print "You need to enter a root password." print "You need to enter a root password."
read -r -s -p "Set a root password: " rootpass read -r -s -p "Set a root password: " rootpass
[ -n "$rootpass" ] && break [ -n "$rootpass" ] && break
done done
echo echo
read -r -s -p "Password (again): " rootpass2 read -r -s -p "Password (again): " rootpass2
echo echo
[ "$rootpass" = "$rootpass2" ] && break [ "$rootpass" = "$rootpass2" ] && break
echo "Passwords don't match, try again." echo "Passwords don't match, try again."
done done
} }
# Microcode detector (function). # Microcode detector (function).