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

Refactor canceling proces

Browse source 
Gather the common canceling process to one function
This commit is contained in:
Suikan 2021-07-03 09:03:45 +09:00
parent 0779994278
commit 6bbab99bad
1 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,12 +2,10 @@
# shellcheck disable=SC1091 # shellcheck disable=SC1091
# Load configuration parameter # Load configuration parameter
source config.sh source ./config.sh
# Load functions # Load functions
source lib/confirmation_common.sh source ./lib.sh
source lib/pre_install_common.sh
source lib/para_install_msg_common.sh
function main() { function main() {
@ -39,7 +37,7 @@ function main() {
# ******************************************************************************* # *******************************************************************************
# Common part of the parameter confirmation # Common part of the parameter confirmation
if ! confirmation_common ; then if ! confirmation ; then
return 1 # with error status return 1 # with error status
fi fi
@ -48,7 +46,7 @@ function main() {
# ******************************************************************************* # *******************************************************************************
# Common part of the pre-install stage # Common part of the pre-install stage
if ! pre_install_common ; then if ! pre_install ; then
return 1 # with error status return 1 # with error status
fi fi
@ -58,7 +56,7 @@ function main() {
# ******************************************************************************* # *******************************************************************************
# Show common message to let the operator focus on the critical part # Show common message to let the operator focus on the critical part
para_install_msg_common para_install_msg
# Ubuntu dependent message # Ubuntu dependent message
cat <<- HEREDOC cat <<- HEREDOC
@ -177,22 +175,10 @@ function grub_check_and_modify() {
do do
sleep 1 # 1sec. sleep 1 # 1sec.
# Check if installer still exist # Check if installer quit unexpectedly
if ! ps $INSTALLER_PID > /dev/null ; then # If not exists if ! ps $INSTALLER_PID > /dev/null ; then # If not exists
echo "***** ERROR : The GUI/TUI installer terminated unexpectedly. *****" # Delete the nwe volume if overwrite install, and close all
if [ "${OVERWRITEINSTALL}" -eq 0 ] ; then # If not over install, volume is new. So delete it on_unexpected_installer_quit
echo "...Deleting the new logical volume \"${VGNAME}-${LVROOTNAME}\"."
lvremove -f /dev/mapper/"${VGNAME}"-"${LVROOTNAME}"
fi
echo "...Deactivating all logical volumes in volume group \"${VGNAME}\"."
vgchange -a n "${VGNAME}"
echo "...Closing LUKS volume \"${CRYPTPARTNAME}\"."
cryptsetup close "${CRYPTPARTNAME}"
cat <<-HEREDOC
...The new logical volume has been deleted. You can retry Kaiten-yaki again.
...Installation process terminated.
HEREDOC
return 1 # with error status return 1 # with error status
fi fi
done # while done # while