Preservation/kaiten-yaki
1
0
Fork 0
mirror of https://github.com/suikan4github/kaiten-yaki.git synced 2025-12-20 10:31: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

4
script/common/parainstall.sh
View file

@ -14,13 +14,13 @@ function parainstall() {
# Check if installer still exist
if ! ps $INSTALLER_PID > /dev/null ; then # If not exists
cat <<-HEREDOC 1>&2
The installer terminated unexpectedly.
...The installer terminated unexpectedly.
...Delete the new logical volume "${VGNAME}-${LVROOTNAME}".
HEREDOC
lvremove -f /dev/mapper/${VGNAME}-${LVROOTNAME}
cat <<-HEREDOC 1>&2
Installation process terminated.
...Installation process terminated.
HEREDOC
return 1 # with error status
fi

8
script/common/preinstall.sh
View file

@ -50,9 +50,9 @@ function pre_install() {
if [ ! -e /dev/mapper/${CRYPTPARTNAME} ] ; then
cat <<- HEREDOC 1>&2
***** ERROR : Cannot open LUKS volume "${CRYPTPARTNAME}" on ${DEV}${CRYPTPARTITION}. *****
Check passphrase and config.txt
...Check passphrase and config.txt
Installation terminated.
...Installation process terminated..
HEREDOC
return 1 # with error status
fi # if crypt volume is unable to open
@ -82,9 +82,9 @@ function pre_install() {
if [ -e /dev/mapper/${VGNAME}-${LVROOTNAME} ] ; then
cat <<- HEREDOC 1>&2
***** ERROR : Logical volume "${VGNAME}-${LVROOTNAME}" already exists. *****
Check LVROOTNAME environment variable in config.txt.
...Check LVROOTNAME environment variable in config.txt.
Installation terminated.
...Installation process terminated..
HEREDOC
return 1 # with error status
else

2
script/ubuntu-kaiten-yaki.sh
View file

@ -27,7 +27,7 @@ function main() {
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

2
script/void-kaiten-yaki.sh
View file

@ -27,7 +27,7 @@ function main() {
if [ ${YESNO} != "Y" -a ${YESNO} != "y" ] ; then
cat <<- HEREDOC 1>&2
Installation terminated.
...Installation process terminated..
HEREDOC
return
fi # if YES