Preservation/kaiten-yaki
1
0
Fork 0
mirror of https://github.com/suikan4github/kaiten-yaki.git synced 2025-12-20 02:21:17 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add "..." to Install process termination message

Browse source
This commit is contained in:
Suikan 2021-07-02 08:49:25 +09:00
parent f92329b782
commit a28dbcaa74
5 changed files with 22 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

27
script/common/confirmation.sh
View file

@ -9,10 +9,10 @@ function confirmation(){
if echo ${VGNAME} | grep "-" -i > /dev/null ; then # "-" is found in the volume group name.
cat <<- HEREDOC 1>&2
***** ERROR : VGNAME is "${VGNAME}" *****
"-" is not allowed in the volume name.
Check passphrase and config.txt
..."-" is not allowed in the volume name.
...Check passphrase and config.txt
Installation terminated.
...Installation process terminated..
HEREDOC
return 1 # with error status
fi # "-" is found in the volume group name.
@ -21,10 +21,10 @@ function confirmation(){
if echo ${LVROOTNAME} | grep "-" -i > /dev/null ; then # "-" is found in the volume name.
cat <<- HEREDOC 1>&2
***** ERROR : LVROOTNAME is "${LVROOTNAME}" *****
"-" is not allowed in the volume name.
Check passphrase and config.txt
..."-" is not allowed in the volume name.
...Check passphrase and config.txt
Installation terminated.
...Installation process terminated..
HEREDOC
return 1 # with error status
fi # "-" is found in the volume name.
@ -33,10 +33,10 @@ function confirmation(){
if echo ${LVSWAPNAME} | grep "-" -i > /dev/null ; then # "-" is found in the volume name.
cat <<- HEREDOC 1>&2
***** ERROR : LVSWAPNAME is "${LVSWAPNAME}" *****
"-" is not allowed in the volume name.
Check passphrase and config.txt
..."-" is not allowed in the volume name.
...Check passphrase and config.txt
Installation terminated.
...Installation process terminated..
HEREDOC
return 1 # with error status
fi # "-" is found in the volume name.
@ -52,7 +52,7 @@ function confirmation(){
if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then
cat <<- HEREDOC 1>&2
Installation terminated.
...Installation process terminated..
HEREDOC
return 1 # with error status
fi # if YES
@ -63,9 +63,9 @@ function confirmation(){
read YESNO
if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then
cat <<-HEREDOC 1>&2
Check config.sh. The variable ERASEALL is ${ERASEALL}.
...Check config.sh. The variable ERASEALL is ${ERASEALL}.
Installation terminated.
...Installation process terminated..
HEREDOC
return 1 # with error status
fi # if YES
@ -73,6 +73,7 @@ function confirmation(){
# ----- Set Passphrase -----
# Input passphrase
echo ""
echo "Type passphrase for the disk encryption."
read -sr PASSPHRASE
export PASSPHRASE
@ -85,7 +86,7 @@ function confirmation(){
cat <<-HEREDOC 1>&2
***** ERROR : Passphrase doesn't match *****
Installation terminated.
...Installation process terminated..
HEREDOC
return 1 # with error status
fi # passphrase validation