From 21e0aa7abb161b5d0fe82d6532aa0645058567a4 Mon Sep 17 00:00:00 2001 From: James Dinsdale Date: Wed, 14 Sep 2016 20:24:44 +0000 Subject: [PATCH 1/2] Fix ZSH 5.0 compatibility issues Closes issue #3 --- lj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lj b/lj index 23f1041..f639cce 100755 --- a/lj +++ b/lj @@ -105,22 +105,22 @@ function _lumberjack() { l:=loglevel -level:=loglevel # If the help option is passed, output usage information and exit - if [[ $help ]]; then + if [[ -n $help ]]; then _lumberjack_usage exit 0 fi # If the version option is passed, output the version and exit - if [[ $version ]]; then + if [[ -n $version ]]; then echo "0.1.1" exit 0 fi # If the logfile option is passed, set the current logfile # for the parent process ID - if [[ $logfile ]]; then + if [[ -n $logfile ]]; then shift logfile - file=$(realpath $logfile) + file=$logfile # Create the log file if it doesn't exist if [[ ! -f $file ]]; then @@ -130,7 +130,7 @@ function _lumberjack() { # If the loglevel option is passed, set the current loglevel # for the parent process ID - if [[ $loglevel ]]; then + if [[ -n $loglevel ]]; then shift loglevel level=$_log_levels[$loglevel] elif [[ -z $level ]]; then @@ -138,7 +138,7 @@ function _lumberjack() { fi # Check if we're setting options rather than logging - if [[ $logfile || $loglevel ]]; then + if [[ -n $logfile || -n $loglevel ]]; then # Store the state echo "$level $file" >! $statefile From 56d3bae6cc8f100e113956be7f0f37cf5cead055 Mon Sep 17 00:00:00 2001 From: James Dinsdale Date: Wed, 14 Sep 2016 20:33:25 +0000 Subject: [PATCH 2/2] Allow numeric log-level to be specified --- lj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lj b/lj index f639cce..e139502 100755 --- a/lj +++ b/lj @@ -133,7 +133,9 @@ function _lumberjack() { if [[ -n $loglevel ]]; then shift loglevel level=$_log_levels[$loglevel] - elif [[ -z $level ]]; then + fi + + if [[ -z $level ]]; then level=5 fi