cp log instead of installing700, more dialog formatting

merge-requests/273/head
Bernhard Landauer 7 years ago
parent 88add13626
commit 0a623dac79

@ -295,7 +295,7 @@ _DEInfoBody="\nFlere miljøer kan installeres.\n\nGnome og LXDE installerer disp
_InstDETitle="Installer Skrivebords Miljø(er)"
_InstManDEBody="Please choose a Manjaro Environment.\n\nNote that the following are currently available for systemd base only:" # translate me !
_ErrInit="Wrong init system" # translate me !
_WarnInit="is currently available for systemd only\nPlease adjust your selection:" # translate me !
_WarnInit="is currently available for systemd only.\nPlease adjust your selection:" # translate me !
_DiffPro="Select different profile" # translate me !
_InstSystd="Install systemd base" # translate me !
_InstDEBody="Skrivebords Miljøer og deres tilhørende pakkegrupper er listet først."

@ -293,7 +293,7 @@ _DEInfoBody="\nMultiple environments can be installed.\n\nGnome and LXDE come wi
_InstDETitle="Install Desktop Environments"
_InstManDEBody="Please choose a Manjaro Environment.\n\nNote that the following are currently available for systemd base only:"
_ErrInit="Wrong init system"
_WarnInit="is currently available for systemd only\nPlease adjust your selection:"
_WarnInit="is currently available for systemd only.\nPlease adjust your selection:"
_DiffPro="Select different profile"
_InstSystd="Install systemd base"
_InstDEBody="Desktop Environments and their related package groups are listed first."
@ -399,4 +399,4 @@ _MMBody="\nEach step must be followed IN ORDER. Steps 4-8 are all optional. Once
# Close Installer
_CloseInstBody="Close installer?"
_LogInfo="Would you like to keep the install-log?\nIt will be copied to /.m-a.log of the target install, accessible with root permissions only."
_LogInfo="Would you like to keep the install-log?\nIt will be copied to /.m-a.log of the target install."

@ -129,7 +129,7 @@ install_manjaro_de_wm() {
if grep -q ">extra" /tmp/.edition;then
# User to select base|extra profile
DIALOG "$_ExtraTitle" --no-cancel --menu "$_ExtraBody" 0 0 2 \
DIALOG "$_ExtraTitle" --no-cancel --menu "\n$_ExtraBody" 0 0 2 \
"1" "full" \
"2" "minimal" 2>/tmp/.version
@ -259,7 +259,7 @@ install_manjaro_de_wm() {
# Offer to install various "common" packages.
DIALOG " $_InstComTitle " --checklist "$_InstComBody\n\n$_UseSpaceBar" 0 50 20 \
DIALOG " $_InstComTitle " --checklist "\n$_InstComBody\n\n$_UseSpaceBar" 0 50 20 \
"manjaro-settings-manager" "-" off \
"pamac" "-" off \
"octopi" "-" off \

@ -52,7 +52,7 @@ main_menu_online() {
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
install -m700 ${LOGFILE} /mnt/.m-a.log
cp ${LOGFILE} /mnt/.m-a.log
fi
fi
umount_partitions

@ -114,7 +114,11 @@ submenu() {
# Adapted from AIS. Checks if system is made by Apple, whether the system is BIOS or UEFI,
# and for LVM and/or LUKS.
id_system() {
[[ ! $(pacman -Q manjaro-architect 2>/dev/null) ]] && check_for_error "[[ $(pacman -Q manjaro-architect-dev) ]]" || check_for_error "[[ $(pacman -Q manjaro-architect) ]]"
if [[ ! $(pacman -Q manjaro-architect &>/dev/null) ]]; then
printf "\n :: $(pacman -Q manjaro-architect-dev) ::\n\n" >> ${LOGFILE}
else
printf "\n :: $(pacman -Q manjaro-architect) ::\n\n" >> ${LOGFILE}
fi
# Apple System Detection
if [[ "$(cat /sys/class/dmi/id/sys_vendor)" == 'Apple Inc.' ]] || [[ "$(cat /sys/class/dmi/id/sys_vendor)" == 'Apple Computer, Inc.' ]]; then
@ -410,7 +414,7 @@ final_check() {
# Empty the list
echo "" > ${CHECKLIST}
# Check if base is installed
[[ -e /mnt/etc ]] || echo "- Base is not installed" >> ${CHECKLIST}
[[ -e /mnt/.base_installed ]] || echo "- Base is not installed" >> ${CHECKLIST}
# Check if bootloader is installed
if [[ $SYSTEM == "BIOS" ]]; then
arch_chroot "pacman -Qq grub" &> /dev/null || echo "- Bootloader is not installed" >> ${CHECKLIST}

Loading…
Cancel
Save