mirror of
https://github.com/classy-giraffe/easy-arch.git
synced 2025-11-17 11:30:55 +00:00
fix indentation of password selection functions
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:
parent
3df93905c4
commit
576912e9ec
1 changed files with 42 additions and 42 deletions
84
easy-arch.sh
84
easy-arch.sh
|
|
@ -104,20 +104,20 @@ network_selector () {
|
|||
|
||||
# Setting up a password for the LUKS Container (function).
|
||||
lukspass_selector () {
|
||||
while true; do
|
||||
read -r -s -p "Insert password for the LUKS container (you're not going to see the password): " password
|
||||
while [ -z "$password" ]; do
|
||||
echo
|
||||
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
|
||||
[ -n "$password" ] && break
|
||||
done
|
||||
echo
|
||||
read -r -s -p "Password (again): " password2
|
||||
echo
|
||||
[ "$password" = "$password2" ] && break
|
||||
echo "Passwords don't match, try again."
|
||||
done
|
||||
while true; do
|
||||
read -r -s -p "Insert password for the LUKS container (you're not going to see the password): " password
|
||||
while [ -z "$password" ]; do
|
||||
echo
|
||||
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
|
||||
[ -n "$password" ] && break
|
||||
done
|
||||
echo
|
||||
read -r -s -p "Password (again): " password2
|
||||
echo
|
||||
[ "$password" = "$password2" ] && break
|
||||
echo "Passwords don't match, try again."
|
||||
done
|
||||
echo -n "$password" | cryptsetup luksFormat "$CRYPTROOT" -d -
|
||||
echo -n "$password" | cryptsetup open "$CRYPTROOT" cryptroot -d -
|
||||
BTRFS="/dev/mapper/cryptroot"
|
||||
|
|
@ -125,38 +125,38 @@ lukspass_selector () {
|
|||
|
||||
# Setting up a password for the user account (function).
|
||||
userpass_selector () {
|
||||
while true; do
|
||||
read -r -s -p "Set a user password for $username: " userpass
|
||||
while [ -z "$userpass" ]; do
|
||||
echo
|
||||
print "You need to enter a password for $username."
|
||||
read -r -s -p "Set a user password for $username: " userpass
|
||||
[ -n "$userpass" ] && break
|
||||
done
|
||||
echo
|
||||
read -r -s -p "Insert password again: " userpass2
|
||||
echo
|
||||
[ "$userpass" = "$userpass2" ] && break
|
||||
echo "Passwords don't match, try again."
|
||||
done
|
||||
while true; do
|
||||
read -r -s -p "Set a user password for $username: " userpass
|
||||
while [ -z "$userpass" ]; do
|
||||
echo
|
||||
print "You need to enter a password for $username."
|
||||
read -r -s -p "Set a user password for $username: " userpass
|
||||
[ -n "$userpass" ] && break
|
||||
done
|
||||
echo
|
||||
read -r -s -p "Insert password again: " userpass2
|
||||
echo
|
||||
[ "$userpass" = "$userpass2" ] && break
|
||||
echo "Passwords don't match, try again."
|
||||
done
|
||||
}
|
||||
|
||||
# Setting up a password for the root account (function).
|
||||
rootpass_selector () {
|
||||
while true; do
|
||||
read -r -s -p "Set a root password: " rootpass
|
||||
while [ -z "$rootpass" ]; do
|
||||
echo
|
||||
print "You need to enter a root password."
|
||||
read -r -s -p "Set a root password: " rootpass
|
||||
[ -n "$rootpass" ] && break
|
||||
done
|
||||
echo
|
||||
read -r -s -p "Password (again): " rootpass2
|
||||
echo
|
||||
[ "$rootpass" = "$rootpass2" ] && break
|
||||
echo "Passwords don't match, try again."
|
||||
done
|
||||
while true; do
|
||||
read -r -s -p "Set a root password: " rootpass
|
||||
while [ -z "$rootpass" ]; do
|
||||
echo
|
||||
print "You need to enter a root password."
|
||||
read -r -s -p "Set a root password: " rootpass
|
||||
[ -n "$rootpass" ] && break
|
||||
done
|
||||
echo
|
||||
read -r -s -p "Password (again): " rootpass2
|
||||
echo
|
||||
[ "$rootpass" = "$rootpass2" ] && break
|
||||
echo "Passwords don't match, try again."
|
||||
done
|
||||
}
|
||||
|
||||
# Microcode detector (function).
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue