diff --git a/logout.sh b/logout.sh index 46aeb99..893bd67 100755 --- a/logout.sh +++ b/logout.sh @@ -31,9 +31,9 @@ handler() { logout) if pgrep sddm-helper; then killall sddm-helper - elif [ "$SESH" = "kwin" ]; then + elif pgrep plasmashell; then killall plasmashell - elif [ "$SESH" = "ryudo" ]; then + elif pgrep ryudo; then pkill -9 -P $(pgrep ryudo) else killall -0 Xorg diff --git a/t2stats.sh b/t2stats.sh index 3e96bd4..8f4e540 100755 --- a/t2stats.sh +++ b/t2stats.sh @@ -41,7 +41,7 @@ if [ "$1" = "-r" ]; then meter=" " ;; 1|2|3|4|5|6|7|8|9) - meter="[ " + meter=" " ;; 10|11|12|13|14|15|16|17|18|19) meter=" " diff --git a/transsetter.sh b/transsetter.sh index 0b813ce..ce50051 100755 --- a/transsetter.sh +++ b/transsetter.sh @@ -6,7 +6,7 @@ # Copyleft 2021 Derek Stevens termprog=Alacritty -geditor=kate +geditor=acme opacity=0.85 setter=$(which transset) @@ -19,12 +19,12 @@ if [ -z "$setter" ]; then exit 1 fi -if which xcompmgr > /dev/null; then - xcompmgr -n& -else - ehco "we need xcompmgr in PATH!" - exit 1 -fi +#if which xcompmgr > /dev/null; then +# xcompmgr -n& +#else +# ehco "we need xcompmgr in PATH!" +# exit 1 +#fi if ! which xshove > /dev/null; then echo "we need xshove in PATH!" diff --git a/ztabelle.sh b/ztabelle.sh new file mode 100755 index 0000000..654459c --- /dev/null +++ b/ztabelle.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +if [ -z $2 ]; then + echo "usage:" + echo " $0 MONTH YEAR" + echo " Print report of tracked time for the given month to stdout" + exit 1 +fi + +month=$1 +year=$2 + +start=$(date -Is --date="0:00 ${month} 1 ${year}") + +case ${month} in + jan|Jan|january|January) nextMonth=feb;; + feb|Feb|february|February) nextMonth=mar;; + mar|Mar|march|March) nextMonth=apr;; + apr|Apr|april|April) nextMonth=may;; + may|May) nextMonth=jun;; + jun|Jun|june|June) nextMonth=july;; + jul|Jul|july|July) nextMonth=aug;; + aug|Aug|august|August) nextMonth=sep;; + sep|Sep|september|September) nextMonth=oct;; + oct|Oct|october|October) nextMonth=nov;; + nov|Nov|november|November) nextMonth=dec;; + dec|Dec|december|December) nextMonth=jan; year=$((year + 1));; +esac + +end=$(date -Is --date="0:00 ${nextMonth} 1 ${year}") + + +header1="=====TIMESHEET FOR $(echo ${start} | awk -F\- '{print $1"-"$2}')=====" +header2="=====COMPLETE LOG=====" + +echo ${header1} +echo + +zeit list --since ${start} --until ${end} --total --no-colors | tail -n2 + +for p in $(zeit list --since ${start} --until ${end} --only-projects-and-tasks --no-colors | grep ◆ | awk '{print $2}'); do + echo "${p}:" + echo "\t$(zeit list --since ${start} --until ${end} --project ${p} --total | tail -n2 | cut -f2- -d ' ')" +done + +echo +echo +echo ${header2} +echo + +for e in $(zeit list --since ${start} --until ${end} --no-colors | awk '{print $1}'); do + zeit entry ${e} --no-colors | awk NF + echo +done