fix cpu_usage: cannot set to 0 decimal places

1 files changed, 14 insertions, 7 deletions

diff --git a/scripts/i3blocks/cpu_usage b/scripts/i3blocks/cpu_usage
index 8c3c1f5..ea9d334 100755
--- a/scripts/i3blocks/cpu_usage
+++ b/scripts/i3blocks/cpu_usage
@@ -12,26 +12,31 @@ use utf8;
 use Getopt::Long;
 
 # default values
-my $t_warn = 50;
-my $t_crit = 80;
+my $t_warn = $ENV{T_WARN} // 50;
+my $t_crit = $ENV{T_CRIT} // 80;
 my $cpu_usage = -1;
+my $decimals = $ENV{DECIMALS} // 2;
+my $label = $ENV{LABEL} // "";
 
 sub help {
-    print "Usage: cpu_usage [-w <warning>] [-c <critical>]\n";
+    print "Usage: cpu_usage [-w <warning>] [-c <critical>] [-d <decimals>]\n";
     print "-w <percent>: warning threshold to become yellow\n";
     print "-c <percent>: critical threshold to become red\n";
+    print "-d <decimals>:  Use <decimals> decimals for percentage (default is $decimals) \n";
     exit 0;
 }
 
 GetOptions("help|h" => \&help,
            "w=i"    => \$t_warn,
-           "c=i"    => \$t_crit);
+           "c=i"    => \$t_crit,
+           "d=i"    => \$decimals,
+);
 
 # Get CPU usage
 $ENV{LC_ALL}="en_US"; # if mpstat is not run under en_US locale, things may break, so make sure it is
 open (MPSTAT, 'mpstat 1 1 |') or die;
 while (<MPSTAT>) {
-    if (/^.*\s+(\d+\.\d+)\s+$/) {
+    if (/^.*\s+(\d+\.\d+)[\s\x00]?$/) {
         $cpu_usage = 100 - $1; # 100% - %idle
         last;
     }
@@ -41,8 +46,10 @@ close(MPSTAT);
 $cpu_usage eq -1 and die 'Can\'t find CPU information';
 
 # Print short_text, full_text
-printf "%.2f%%\n", $cpu_usage;
-printf "%.2f%%\n", $cpu_usage;
+print "${label}";
+printf "%.${decimals}f%%\n", $cpu_usage;
+print "${label}";
+printf "%.${decimals}f%%\n", $cpu_usage;
 
 # Print color, if needed
 if ($cpu_usage >= $t_crit) {