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

Merge pull request #59 from papajoker/fonction

Browse Source 
return function
This commit is contained in:
Chrysostomus 2017-02-24 09:28:37 +08:00 committed by GitHub
commit 523114a024
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/util.sh
View File

@ -147,21 +147,23 @@ id_system() {
# If there is an error, display it and go back to main menu. In any case, write to logfile.
# param 2 : error code is optional
# param 3 : return menu function , optional, default: main_menu_online
check_for_error() {
local _msg="$1"
local _err="${2:-0}"
local _canceldlg=1
local _function_menu="${3:-main_menu_online}"
((${_err}!=0)) && _msg="[${_msg}][${_err}]"
[[ -f "${ERR}" ]] && {
_msg="${_msg} $(head -n1 ${ERR})"
_canceldlg=0 # not btn cancel
rm "${ERR}"
}
if ((${_err}!=0)) && ((${_canceldlg}==0)); then
# and function varsdump ? _msg="$_msg \n $(declare -p | grep -v " _")"
echo -e "$(date +%D\ %T) ERROR ${_msg}" >> "${LOGFILE}"
if ((${_err}!=0)) ; then
# and function varsdump ? _msg="$_msg \n $(declare -p | grep -v " _")"
local _fpath="${FUNCNAME[*]:1:2}()"
_fpath=" --${_fpath// /()<-}"
echo -e "$(date +%D\ %T) ERROR ${_msg} ${_fpath}" >> "${LOGFILE}"
DIALOG " $_ErrTitle " --msgbox "\n${_msg}\n" 0 0
main_menu_online
($_function_menu)
else
echo -e "$(date +%D\ %T) ${_msg}" >> "${LOGFILE}"
fi