Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-09 19:11:02 +00:00
Code Issues Projects Releases Wiki Activity

separate function exit_done()

Browse Source 
- final_check() produces ugly output when no partition is mounted
- write log to target also only makes sense when a chroot is present
This commit is contained in:
Bernhard Landauer 2017-02-28 22:16:15 +01:00
parent a8f29db79a
commit 416e66e85f
2 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/util-menu.sh
View File

@ -44,25 +44,9 @@ main_menu_online() {
;; ;;
"8") edit_configs "8") edit_configs
;; ;;
*) final_check *) exit_done
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "$_CloseInstBody $(cat ${CHECKLIST})" 0 0
if [[ $? -eq 0 ]]; then
echo "exit installer." >> ${LOGFILE}
if [[ -e /mnt/usr ]]; then
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "\n$_LogInfo\n" 0 0
if [[ $? -eq 0 ]]; then
[[ -e /mnt/.m-a.log ]] && cat ${LOGFILE} >> /mnt/.m-a.log
cp ${LOGFILE} /mnt/.m-a.log
fi
fi
umount_partitions
clear
exit 0
fi
;; ;;
esac esac
main_menu_online
} }
# Preparation # Preparation

29
lib/util.sh
View File

@ -429,3 +429,32 @@ final_check() {
# check if user account has been generated # check if user account has been generated
[[ $(ls /mnt/home) == "" ]] && echo "- No user accounts have been generated" >> ${CHECKLIST} [[ $(ls /mnt/home) == "" ]] && echo "- No user accounts have been generated" >> ${CHECKLIST}
} }
exit_done() {
if [[ $(lsblk -o MOUNTPOINT | grep ${MOUNTPOINT}) != "" ]]; then
final_check
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "$_CloseInstBody $(cat ${CHECKLIST})" 0 0
if [[ $? -eq 0 ]]; then
echo "exit installer." >> ${LOGFILE}
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "\n$_LogInfo\n" 0 0
if [[ $? -eq 0 ]]; then
[[ -e /mnt/.m-a.log ]] && cat ${LOGFILE} >> /mnt/.m-a.log
cp ${LOGFILE} /mnt/.m-a.log
fi
umount_partitions
clear
exit 0
else
main_menu_online
fi
else
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "$_CloseInstBody" 0 0
if [[ $? -eq 0 ]]; then
umount_partitions
clear
exit 0
else
main_menu_online
fi
fi
}