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

Merge branch 'new_structure' of https://github.com/oberon2007/manjaro-architect into new_structure

Browse Source
This commit is contained in:
Bernhard Landauer 2017-03-02 04:04:50 +01:00
commit f8c755ec03
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/util-menu.sh
View File

@ -634,7 +634,7 @@ install_acc_menu() {
# If something has been selected, install # If something has been selected, install
if [[ $(cat ${PACKAGES}) != "" ]]; then if [[ $(cat ${PACKAGES}) != "" ]]; then
basestrap ${MOUNTPOINT} ${PACKAGES} 2>$ERR basestrap ${MOUNTPOINT} ${PACKAGES} 2>$ERR
check_for_error "$FUNCNAME" $? check_for_error "$FUNCNAME" $? || return $?
fi fi
} }
@ -711,7 +711,7 @@ edit_configs() {
if [[ $FILE == "${MOUNTPOINT}/etc/mkinitcpio.conf" ]]; then if [[ $FILE == "${MOUNTPOINT}/etc/mkinitcpio.conf" ]]; then
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "${_MMRunMkinit}?" 0 0 && { dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --yesno "${_MMRunMkinit}?" 0 0 && {
run_mkinitcpio 2>$ERR run_mkinitcpio 2>$ERR
check_for_error "run_mkinitcpio" "$?" check_for_error "run_mkinitcpio" $?
} }
fi fi
else else

6
lib/util.sh
View File

@ -167,10 +167,12 @@ check_for_error() {
echo -e "$(date +%D\ %T) ERROR ${_msg} ${_fpath}" >> "${LOGFILE}" echo -e "$(date +%D\ %T) ERROR ${_msg} ${_fpath}" >> "${LOGFILE}"
if [[ "${_function_menu}" != "SKIP" ]]; then if [[ "${_function_menu}" != "SKIP" ]]; then
DIALOG " $_ErrTitle " --msgbox "\n${_msg}\n" 0 0 DIALOG " $_ErrTitle " --msgbox "\n${_msg}\n" 0 0
# ($_function_menu) # return error for return to parent menu
return $_err
fi fi
else else
echo -e "$(date +%D\ %T) ${_msg}" >> "${LOGFILE}" # add $FUNCNAME limit to 20 max for control if recursive
echo -e "$(date +%D\ %T) ${_msg} --${FUNCNAME[*]:1:20}" >> "${LOGFILE}"
fi fi
} }