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

avoid using exit code after dialog; https://github.com/Chrysostomus/manjaro-architect/pull/59

Browse Source
This commit is contained in:
Bernhard Landauer 2017-02-23 23:40:55 +01:00
parent 494f6e6f63
commit 1dd1a383fa
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util-base.sh
View File

@ -123,7 +123,7 @@ set_hostname() {
echo "$(cat ${ANSWER})" > ${MOUNTPOINT}/etc/hostname 2>$ERR echo "$(cat ${ANSWER})" > ${MOUNTPOINT}/etc/hostname 2>$ERR
echo -e "#<ip-address>\t<hostname.domain.org>\t<hostname>\n127.0.0.1\tlocalhost.localdomain\tlocalhost\t$(cat \ echo -e "#<ip-address>\t<hostname.domain.org>\t<hostname>\n127.0.0.1\tlocalhost.localdomain\tlocalhost\t$(cat \
${ANSWER})\n::1\tlocalhost.localdomain\tlocalhost\t$(cat ${ANSWER})" > ${MOUNTPOINT}/etc/hosts 2>$ERR ${ANSWER})\n::1\tlocalhost.localdomain\tlocalhost\t$(cat ${ANSWER})" > ${MOUNTPOINT}/etc/hosts 2>$ERR
check_for_error "$FUNCNAME" "$?" check_for_error "$FUNCNAME" 0
} }
# Adapted and simplified from the Manjaro 0.8 and Antergos 2.0 installers # Adapted and simplified from the Manjaro 0.8 and Antergos 2.0 installers

7
lib/util-desktop.sh
View File

@ -210,9 +210,10 @@ install_manjaro_de_wm() {
set_sddm_ck set_sddm_ck
elif [[ "$(cat /tmp/.display-manager)" == lightdm ]]; then elif [[ "$(cat /tmp/.display-manager)" == lightdm ]]; then
set_lightdm_greeter set_lightdm_greeter
sed -i "s/$(grep "DISPLAYMANAGER=" /mnt/etc/conf.d/xdm)/DISPLAYMANAGER=\"lightdm\"/g" /mnt/etc/conf.d/xdm sed -i "s/$(grep "DISPLAYMANAGER=" /mnt/etc/conf.d/xdm)/DISPLAYMANAGER=\"lightdm\"/g" /mnt/etc/conf.d/xdm
arch_chroot "rc-update add xdm default" 2>$ERR arch_chroot "rc-update add xdm default" 2>$ERR
check_for_error "add xdm default: lightdm" "$?" check_for_error "add xdm default: lightdm" "$?"
else else
echo "no display manager was installed" echo "no display manager was installed"
sleep 2 sleep 2
@ -537,7 +538,7 @@ install_multimedia_menu() {
DIALOG " \"My Sweet Buckies\" by Atiya & Carl " --msgbox "\nMy Sweet Buckies,\nYou are the sweetest Buckies that ever did \"buck\",\nLily, Rosie, Trumpet, and Flute,\nMy love for you all is absolute!\n\nThey buck: \"We love our treats, we are the Booyakka sisters,\"\n\"Sometimes we squabble and give each other comb-twisters,\"\n\"And in our garden we love to sunbathe, forage, hop and jump,\"\n\"We love our freedom far, far away from that factory farm dump,\"\n\n\"For so long we were trapped in cramped prisons full of disease,\"\n\"No sunlight, no fresh air, no one who cared for even our basic needs,\"\n\"We suffered in fear, pain, and misery for such a long time,\"\n\"But now we are so happy, we wanted to tell you in this rhyme!\"\n\n" 0 0 DIALOG " \"My Sweet Buckies\" by Atiya & Carl " --msgbox "\nMy Sweet Buckies,\nYou are the sweetest Buckies that ever did \"buck\",\nLily, Rosie, Trumpet, and Flute,\nMy love for you all is absolute!\n\nThey buck: \"We love our treats, we are the Booyakka sisters,\"\n\"Sometimes we squabble and give each other comb-twisters,\"\n\"And in our garden we love to sunbathe, forage, hop and jump,\"\n\"We love our freedom far, far away from that factory farm dump,\"\n\n\"For so long we were trapped in cramped prisons full of disease,\"\n\"No sunlight, no fresh air, no one who cared for even our basic needs,\"\n\"We suffered in fear, pain, and misery for such a long time,\"\n\"But now we are so happy, we wanted to tell you in this rhyme!\"\n\n" 0 0
else else
basestrap ${MOUNTPOINT} $(cat ${PACKAGES}) 2>$ERR basestrap ${MOUNTPOINT} $(cat ${PACKAGES}) 2>$ERR
check_for_error "$FUNCNAME $(cat ${PACKAGES})" "$?" check_for_error "$FUNCNAME $(cat ${PACKAGES})" "$?"
fi fi
fi fi
} }

2
lib/util-disk.sh
View File

@ -436,7 +436,7 @@ mount_partitions() {
# If it is already a fat/vfat partition... # If it is already a fat/vfat partition...
if [[ $(fsck -N $PARTITION | grep fat) ]]; then if [[ $(fsck -N $PARTITION | grep fat) ]]; then
DIALOG " $_PrepMntPart " --yesno "$_FormUefiBody $PARTITION $_FormUefiBody2" 0 0 && mkfs.vfat -F32 ${PARTITION} >/dev/null 2>$ERR DIALOG " $_PrepMntPart " --yesno "$_FormUefiBody $PARTITION $_FormUefiBody2" 0 0 && mkfs.vfat -F32 ${PARTITION} >/dev/null 2>$ERR
check_for_error "mkfs.vfat -F32 ${PARTITION}" "$?" check_for_error "mkfs.vfat -F32 ${PARTITION}" 0
else else
mkfs.vfat -F32 ${PARTITION} >/dev/null 2>$ERR mkfs.vfat -F32 ${PARTITION} >/dev/null 2>$ERR
check_for_error "mkfs.vfat -F32 ${PARTITION}" "$?" check_for_error "mkfs.vfat -F32 ${PARTITION}" "$?"

2
lib/util.sh
View File

@ -311,7 +311,7 @@ configure_mirrorlist() {
;; ;;
"3") nano /etc/pacman.conf "3") nano /etc/pacman.conf
DIALOG " $_MirrorPacman " --yesno "$_MIrrorPacQ" 0 0 && COPY_PACCONF=1 || COPY_PACCONF=0 DIALOG " $_MirrorPacman " --yesno "$_MIrrorPacQ" 0 0 && COPY_PACCONF=1 || COPY_PACCONF=0
check_for_error "edit pacman.conf" "$?" check_for_error "edit pacman.conf" 0
pacman -Syy pacman -Syy
;; ;;
*) install_base_menu *) install_base_menu