lib.bash: simplify prefix condition

grawity · Mar 7, 2014 · 13702cb · 13702cb
1 parent 4297577
commit 13702cb
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/bin/lib.bash b/bin/lib.bash
@@ -30,10 +30,9 @@ print_msg() {
 		color=$3 reset=${color:+'\e[m'}
 	fi
 	if [[ $DEBUG ]]; then
-		local progname="$progname[$$]"
+		local progname="$progname[$$]" progname_prefix=1
 	fi
-	if [[ $DEBUG || $progname_prefix -gt 0 ||
+	if (( progname_prefix > 0 || ( progname_prefix < 0 && _lvl ) )); then
-	      ( $progname_prefix -le 0 && $_lvl -gt 0 ) ]]; then
 		nprefix="$progname: "
 	fi
 	printf "%s${color}%s:${reset} %s\n" "$nprefix" "$prefix" "$msg"
@@ -48,8 +47,7 @@ print_fmsg() {
 	if [[ -t 1 ]]; then
 		color="$fcolor" reset='\e[m'
 	fi
-	if [[ $progname_prefix -gt 0 ||
+	if (( progname_prefix > 0 || ( progname_prefix < 0 && _lvl ) )); then
-	      ( $progname_prefix -le 0 && $_lvl -gt 0 ) ]]; then
 		nprefix="$progname: "
 	fi
 	printf "%s${color}%s${reset} %s\n" "$nprefix" "$fprefix" "$msg"