Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-08 01:10:26 +00:00
Code Issues Projects Releases Wiki Activity

some logging and dialog cosmetics

Browse Source
This commit is contained in:
Bernhard Landauer 2017-02-27 03:35:31 +01:00
parent d57e242825
commit d7e9686eeb
5 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util-base.sh
View File

@ -74,11 +74,11 @@ set_timezone() {
DIALOG " $_ConfBseTimeHC " --menu "$_TimeSubZBody" 0 0 11 ${SUBZONE} 2>${ANSWER} || config_base_menu DIALOG " $_ConfBseTimeHC " --menu "$_TimeSubZBody" 0 0 11 ${SUBZONE} 2>${ANSWER} || config_base_menu
SUBZONE=$(cat ${ANSWER}) SUBZONE=$(cat ${ANSWER})
DIALOG " $_ConfBseTimeHC " --yesno "$_TimeZQ ${ZONE}/${SUBZONE}?" 0 0 DIALOG " $_ConfBseTimeHC " --yesno "\n$_TimeZQ ${ZONE}/${SUBZONE}?\n" 0 0
if (( $? != 0 )); then if (( $? != 0 )); then
arch_chroot "ln -sf /usr/share/zoneinfo/${ZONE}/${SUBZONE} /etc/localtime" 2>$ERR arch_chroot "ln -sf /usr/share/zoneinfo/${ZONE}/${SUBZONE} /etc/localtime" 2>$ERR
check_for_error "$FUNCNAME" $? config_base_menu check_for_error "$FUNCNAME ${ZONE}/${SUBZONE}" $? config_base_menu
else else
config_base_menu config_base_menu
fi fi

2
lib/util-desktop.sh
View File

@ -292,7 +292,7 @@ install_manjaro_de_wm_pkg() {
PROFILES="/usr/share/manjaro-tools/iso-profiles" PROFILES="/usr/share/manjaro-tools/iso-profiles"
# Only show this information box once # Only show this information box once
if [[ $SHOW_ONCE -eq 0 ]]; then if [[ $SHOW_ONCE -eq 0 ]]; then
DIALOG " $_InstDETitle " --msgbox "$_InstPBody" 0 0 DIALOG " $_InstDETitle " --msgbox "\n$_InstPBody\n" 0 0
SHOW_ONCE=1 SHOW_ONCE=1
fi fi
clear clear

3
lib/util-disk.sh
View File

@ -323,11 +323,12 @@ mount_partitions() {
# Use special mounting options if selected, else standard mount # Use special mounting options if selected, else standard mount
if [[ $(cat ${MOUNT_OPTS}) != "" ]]; then if [[ $(cat ${MOUNT_OPTS}) != "" ]]; then
mount -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR mount -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
check_for_error "mount -o $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT}" "$?"
else else
mount ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR mount ${PARTITION} ${MOUNTPOINT}${MOUNT} 2>$ERR
check_for_error "mount $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT}" "$?"
fi fi
check_for_error "mount (-o) $(cat ${MOUNT_OPTS}) ${PARTITION} ${MOUNTPOINT}${MOUNT}" "$?"
confirm_mount ${MOUNTPOINT}${MOUNT} confirm_mount ${MOUNTPOINT}${MOUNT}
# Identify if mounted partition is type "crypt" (LUKS on LVM, or LUKS alone) # Identify if mounted partition is type "crypt" (LUKS on LVM, or LUKS alone)

4
lib/util-menu.sh
View File

@ -46,8 +46,10 @@ main_menu_online() {
;; ;;
*) dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "$_CloseInstBody" 0 0 *) dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "$_CloseInstBody" 0 0
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "$_LogInfo" 0 0 check_for_error "exit installer."
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "\n$_LogInfo\n" 0 0
if [[ $? -eq 0 ]]; then if [[ $? -eq 0 ]]; then
[[ -e /mnt/.m-a.log ]] && cat ${LOGFILE} >> /mnt/.m-a.log
install -m700 ${LOGFILE} /mnt/.m-a.log install -m700 ${LOGFILE} /mnt/.m-a.log
fi fi
umount_partitions umount_partitions

2
lib/util.sh
View File

@ -388,7 +388,7 @@ evaluate_profiles() {
# verify if profile is available for openrc # verify if profile is available for openrc
evaluate_openrc() { evaluate_openrc() {
if [[ ! $(grep ">openrc" $PROFILES/*/$(cat /tmp/.desktop)/Packages-Desktop) ]]; then if [[ ! $(grep ">openrc" $PROFILES/*/$(cat /tmp/.desktop)/Packages-Desktop) ]]; then
DIALOG "$_ErrInit" --menu "[Manjaro-$(cat /tmp/.desktop)] $_WarnInit" 0 0 2 \ DIALOG "$_ErrInit" --menu "\n[Manjaro-$(cat /tmp/.desktop)] $_WarnInit\n" 0 0 2 \
"1" "$_DiffPro" \ "1" "$_DiffPro" \
"2" "$_InstSystd" 2>${ANSWER} "2" "$_InstSystd" 2>${ANSWER}
check_for_error "selected systemd-only profile [$(cat /tmp/.desktop)] with openrc base. -> $(cat ${ANSWER})" check_for_error "selected systemd-only profile [$(cat /tmp/.desktop)] with openrc base. -> $(cat ${ANSWER})"