src

commit c1ad1d5586801672f2a832e977e841624cb31275
parent 1e9cf15cd6f1aca2405ac29700a2cca03a8fe53c
author: nathanael <nathanael@dalliard.ch>
date:   Sun, 19 Oct 2025 11:54:01 +0000

s0(c): simpler genreport.sh

diffstat:
M
s0/cockpit/bin/genreport.sh
 | 
41
+++++------------------------------------

1 file changed, 5 insertions(+), 36 deletions(-)
diff --git a/s0/cockpit/bin/genreport.sh b/s0/cockpit/bin/genreport.sh
@@ -1,56 +1,25 @@
 #!/bin/sh
+file=~/prv/txs
 
-file=~/prv/transactions
-
-fail() { >&2 echo "$@"; exit 1; }
-usage() { fail "usage: ${0##*/} <year>"; }
-
-test -z "$1" && usage
-
-cur_year="$1"
+cur_year=$(date +%Y)
 cur_inc=$(grep -E "$cur_year.*business.*inc" "$file" | awk -F ',' '{sum+=$2} END {print sum}')
-if [ "$cur_inc" = "" ]
-then
-	cur_inc="0"
-fi
-cur_dir=$(grep -E "$cur_year.*business.*dir" "$file" | awk -F ',' '{sum+=$2} END {print sum}')
-if [ "$cur_dir" = "" ]
-then
-	cur_dir=-0
-fi
-cur_edv=$(grep -E "$cur_year.*business.*edv" "$file" | awk -F ',' '{sum+=$2} END {print sum}')
-if [ "$cur_edv" = "" ]
-then
-	cur_edv=-0
-fi
+cur_exp=$(grep -E "$cur_year.*business.*exp" "$file" | awk -F ',' '{sum+=$2} END {print sum}')
+cur_tot=$(echo "$cur_inc" + "$cur_exp" | bc -l)
 
 prev_year=$(echo "$cur_year" - 1 | bc)
 prev_inc=$(grep -E "$prev_year.*business.*inc" "$file" | awk -F ',' '{sum+=$2} END {print sum}')
-prev_dir=$(grep -E "$prev_year.*business.*dir" "$file" | awk -F ',' '{sum+=$2} END {print sum}')
-prev_edv=$(grep -E "$prev_year.*business.*edv" "$file" | awk -F ',' '{sum+=$2} END {print sum}')
-
-prev_exp=$(echo "$prev_dir" + "$prev_edv" | bc -l)
+prev_exp=$(grep -E "$prev_year.*business.*exp" "$file" | awk -F ',' '{sum+=$2} END {print sum}')
 prev_tot=$(echo "$prev_inc" + "$prev_exp" | bc -l)
-cur_exp=$(echo "$cur_dir" + "$cur_edv" | bc -l)
-if [ "$cur_exp" = "0" ]
-then
-	cur_exp=-0
-fi
-cur_tot=$(echo "$cur_inc" + "$cur_exp" | bc -l)
 
 echo '{
   "prev": {
     "prev_inc": "'$prev_inc'",
-    "prev_dir": "'$prev_dir'",
-    "prev_edv": "'$prev_edv'",
     "prev_exp": "'$prev_exp'",
     "prev_tot": "'$prev_tot'",
     "prev_year": "'$prev_year'"
   },
   "cur": {
     "cur_inc": "'$cur_inc'",
-    "cur_dir": "'$cur_dir'",
-    "cur_edv": "'$cur_edv'",
     "cur_exp": "'$cur_exp'",
     "cur_tot": "'$cur_tot'",
     "cur_year": "'$cur_year'"