From 1798adb5555b487d8e1c9c883cd053d185d84598 Mon Sep 17 00:00:00 2001 From: Alexander Bantyev Date: Mon, 28 Dec 2020 13:17:17 +0300 Subject: [PATCH] Update youtrack-wage --- .../i3blocks/scripts/youtrack-wage.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/workspace/i3blocks/scripts/youtrack-wage.nix b/modules/workspace/i3blocks/scripts/youtrack-wage.nix index 4d58289..c31ee75 100644 --- a/modules/workspace/i3blocks/scripts/youtrack-wage.nix +++ b/modules/workspace/i3blocks/scripts/youtrack-wage.nix @@ -5,17 +5,21 @@ in #!${bash}/bin/bash set -euo pipefail export PATH="$PATH:${yt-utilities}/bin:${ec}/bin:${libqalculate}/bin" - - HOURS_DAY=$(yt org local --since $(date +'%Y-%m-%d') | tail -1) HOURS_MONTH=$(yt org local --since $(date +'%Y-%m-01') | tail -1) - HOURS_YEAR=$(yt org local --since $(date +'%Y-01-01') | tail -1) - HOURS_TASK=$(emacsclient --eval "org-mode-line-string" | head -1 | cut -d\" -f 2 | cut -d\[ -f2 | cut -d\] -f1)h - MONEY_TASK=$(qalc -t -e "$HOURS_TASK * (${config.secrets.wage})" ) - MONEY_DAY=$(qalc -t "($HOURS_DAY) * (${config.secrets.wage})") MONEY_MONTH=$(qalc -t "($HOURS_MONTH) * (${config.secrets.wage})") - MONEY_YEAR=$(qalc -t "($HOURS_YEAR) * (${config.secrets.wage})") '' + (if config.deviceSpecific.bigScreen then '' - echo "$MONEY_TASK/$MONEY_DAY($HOURS_DAY)/$MONEY_MONTH($HOURS_MONTH)/$MONEY_YEAR" + HOURS_DAY=$(yt org local --since $(date +'%Y-%m-%d') | tail -1) + HOURS_YEAR=$(yt org local --since $(date +'%Y-01-01') | tail -1) + MONEY_DAY=$(qalc -t "($HOURS_DAY) * (${config.secrets.wage})") + MONEY_YEAR=$(qalc -t "($HOURS_YEAR) * (${config.secrets.wage})") + TASK=$(emacsclient --eval "org-mode-line-string" 2>/dev/null || echo -n none) + if ! [[ "$TASK" == "none" ]]; then + HOURS_TASK=$(echo "$TASK" | head -1 | cut -d\" -f 2 | cut -d\[ -f2 | cut -d\] -f1)h + MONEY_TASK=$(qalc -t -e "$HOURS_TASK * (${config.secrets.wage})" ) + echo "$MONEY_TASK/$MONEY_DAY($HOURS_DAY)/$MONEY_MONTH($HOURS_MONTH)/$MONEY_YEAR" + else + echo "$MONEY_DAY($HOURS_DAY)/$MONEY_MONTH($HOURS_MONTH)/$MONEY_YEAR" + fi '' else '' echo "$MONEY_MONTH($HOURS_MONTH)" '')