jess
/
manjaro-arm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
schinfo 2019-05-08 10:23:54 +02:00
parent ff18fac509 4ed8fc3742
commit 39e9234842
1 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
manjaro-arm-installer
View File

@ -14,6 +14,8 @@ DEVICE=""
EDITION="" EDITION=""
USER="" USER=""
PASSWORD="" PASSWORD=""
CONFIRMPASSWORD=""
CONFIRMROOTPASSWORD=""
ROOTPASSWORD="" ROOTPASSWORD=""
SDCARD="" SDCARD=""
SDTYP="" SDTYP=""
@ -411,10 +413,25 @@ else
exit 1 exit 1
fi fi
if [ ! -z "$PASSWORD" ] if [ ! -z "$PASSWORD" ]
then then
CONFIRMPASSWORD=$(dialog --clear --title "Manjaro ARM Installer" \
--insecure --passwordbox "Confirm Password for $USER:" 8 50 \
3>&1 1>&2 2>&3 3>&- \
)
else
clear
exit 1
fi
if [[ "$PASSWORD" != "$CONFIRMPASSWORD" ]]; then
clear
msg "User passwords do not match! Please restart the installer and try again."
exit 1
fi
if [ ! -z "$CONFIRMPASSWORD" ]
then
ROOTPASSWORD=$(dialog --clear --title "Manjaro ARM Installer" \ ROOTPASSWORD=$(dialog --clear --title "Manjaro ARM Installer" \
--insecure --passwordbox "Enter Root Password:" 8 50 \ --insecure --passwordbox "Enter Root Password:" 8 50 \
3>&1 1>&2 2>&3 3>&- \ 3>&1 1>&2 2>&3 3>&- \
@ -424,11 +441,25 @@ else
exit 1 exit 1
fi fi
if [ ! -z "$ROOTPASSWORD" ] if [ ! -z "$ROOTPASSWORD" ]
then then
CONFIRMROOTPASSWORD=$(dialog --clear --title "Manjaro ARM Installer" \
--insecure --passwordbox "Confirm Root Password:" 8 50 \
3>&1 1>&2 2>&3 3>&- \
)
else
clear
exit 1
fi
if [[ "$ROOTPASSWORD" != "$CONFIRMROOTPASSWORD" ]]; then
clear
msg "Root passwords do not match! Please restart the installer and try again."
exit 1
fi
if [ ! -z "$CONFIRMROOTPASSWORD" ]
then
# simple command to put the results of lsblk (just the names of the devices) into an array and make that array populate the options # simple command to put the results of lsblk (just the names of the devices) into an array and make that array populate the options
let i=0 let i=0