diff options
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/_ak_log | 32 | ||||
| -rwxr-xr-x | lib/_ak_script | 9 |
2 files changed, 20 insertions, 21 deletions
diff --git a/lib/_ak_log b/lib/_ak_log index 8d6972d..fb39c05 100755 --- a/lib/_ak_log +++ b/lib/_ak_log @@ -79,29 +79,33 @@ function _ak_log_message(){ TS="$(date -u +%s)" if [ ! -z $1 ] && [ -n "$1" ] then - if [ ! -z "$2" ] && [ -n "$2" ] + prg="$1" + shift + if [ ! -z "$1" ] && [ -n "$1" ] then - if [ ! -z "$3" ] && [ -n "$3" ] + tp="$1" + shift + if [ ! -z "$*" ] && [ -n "$*" ] then - msg="$(echo -n $*| cut -d ' ' -f 3-)" - echo "$TS" "<$1>" "[$2]" "$msg" >> $AK_LOGSFILE + msg="$*" + echo "$TS" "<$prg>" "[$tp]" "$msg" >> $AK_LOGSFILE if [ ! -z $AK_DEBUG ] && [ -n "$AK_DEBUG" ] && [ "$AK_DEBUG" == "yes" ] then - _ak_log_print_log_line "$TS <$1> [$2] $msg" >&2 + _ak_log_print_log_line "$TS <$prg> [$tp] $msg" >&2 fi else - echo "$TS" "<$1>" "[ERROR]" "No message" >> $AK_LOGSFILE + echo "$TS" "<$prg>" "[ERROR]" "No message" >> $AK_LOGSFILE if [ "$AK_DEBUG" == "yes" ] then - echo "$TS" "<$1>" "[ERROR]" "No message" >&2 + echo "$TS" "<$prg>" "[ERROR]" "No message" >&2 fi return 1 fi else - echo "$TS" "<$1>" "[ERROR]" "No type and message" >> $AK_LOGSFILE + echo "$TS" "<$prg>" "[ERROR]" "No type and message" >> $AK_LOGSFILE if [ "$AK_DEBUG" == "yes" ] then - echo "$TS" "<$1>" "[ERROR]" "No type and message" >&2 + echo "$TS" "<$prg>" "[ERROR]" "No type and message" >&2 fi return 1 fi @@ -116,23 +120,23 @@ function _ak_log_message(){ } function _ak_log_exit(){ - _ak_log_message "$PROGRAM" "EXIT" "$1" + _ak_log_message "$PROGRAM" "EXIT" "$*" } function _ak_log_warning(){ - _ak_log_message "$PROGRAM" "WARNING" "$1" + _ak_log_message "$PROGRAM" "WARNING" "$*" } function _ak_log_debug(){ - _ak_log_message "$PROGRAM" "DEBUG" "$1" + _ak_log_message "$PROGRAM" "DEBUG" "$*" } function _ak_log_error(){ - _ak_log_message "$PROGRAM" "ERROR" "$1" + _ak_log_message "$PROGRAM" "ERROR" "$*" } function _ak_log_info(){ - _ak_log_message "$PROGRAM" "INFO" "$1" + _ak_log_message "$PROGRAM" "INFO" "$*" } # vim: set syntax=bash diff --git a/lib/_ak_script b/lib/_ak_script index a8c4be4..ee422d5 100755 --- a/lib/_ak_script +++ b/lib/_ak_script @@ -44,12 +44,7 @@ function _ak_exit_program(){ function _ak_help(){ if [ ! -z $fullprogrampath ] && [ -n "$fullprogrampath" ] then - cat $fullprogrampath | grep -v '^###' | grep '^##'| sed 's/^##//g;s/^ //g' >&2 #| \ - # cat | while read line - # do - # echo -n "$line" | xxd - # _ak_log_info "$line" - # done + cat $fullprogrampath | grep -v '^###' | grep '^##'| sed 's/^##//g;s/^ //g' >&2 exit 1 else _ak_log_error "fullprogrampath was not set" @@ -94,7 +89,7 @@ function _ak_usage(){ _ak_title_description 2>&1 _ak_license 2>&1 _ak_help 2>&1 - ) | sed 's/^/# /g' | while read line; do _ak_log_info "$line"; done + ) | sed 's/^/# /g' | while read line; do _ak_log_info "${line}"; done } function _ak_print_version(){ |