Modified linux-app-logger - now it updates file corresponding curdate…

… itself

Made corresponding changes in other scripts.

winchecklog

@@ -1,2 +1,2 @@
 #!/bin/bash
-ps ax | fgrep " python ./logger.py winlog" | fgrep -v grep
+ps ax | fgrep " python ./logger.py " | fgrep -v grep

wingettotalresttime

@@ -47,12 +47,16 @@ echo "TOTAL_TIME_NO_REST = '$TOTAL_TIME_NO_REST'"
 TOTAL_TIME_NO_REST_AND_NO_INPUT_TIME_REST=$(($TOTAL_TIME_NO_REST - ($INPUT_REST_TIME_H*60) - $INPUT_REST_TIME_M))
 echo "TOTAL_TIME_NO_REST_AND_NO_INPUT_TIME_REST = $TOTAL_TIME_NO_REST_AND_NO_INPUT_TIME_REST"
 
+TTNRANITR_H=$(($TOTAL_TIME_NO_REST_AND_NO_INPUT_TIME_REST / 60))
+TTNRANITR_M=$(($TOTAL_TIME_NO_REST_AND_NO_INPUT_TIME_REST - ($TTNRANITR_H * 60) ))
+echo "TOTAL_TIME_NO_REST_AND_NO_INPUT_TIME_REST = $TTNRANITR_H h $TTNRANITR_M min"
+
 RESULT_TOTAL=$((6*60 - $TOTAL_TIME_NO_REST_AND_NO_INPUT_TIME_REST))
 RESULT_H=$(($RESULT_TOTAL/60))
 RESULT_M=$(($RESULT_TOTAL - ($RESULT_H*60) ))
 echo "RESULT_TOTAL = $RESULT_TOTAL"
 echo ""
 echo "RESULT $RESULT_H h $RESULT_M min"
 
-RESULT_IN_HOURS=$(calc -p "printf('%.2f', ($RESULT_H + ($RESULT_M/60)) )")
+RESULT_IN_HOURS=$(calc -p "printf('%.2f', ($RESULT_H + ($RESULT_M/60)) )" | sed -e "s/~//")
 echo "RESULT_IN_HOURS = $RESULT_IN_HOURS"

winnamelog

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-ls -1 /home/leonid/bin/linux-app-logger/winlog_* | grep "/winlog_20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]$" | tail -n1
+ls -1 /home/leonid/worklog/winlog_* | grep "/winlog_20[0-9][0-9]-[0-9][0-9]-[0-9][0-9]$" | tail -n1

winopenlog

@@ -1,3 +1,3 @@
 #!/bin/bash
-ps ax | fgrep "python ./logger.py winlog" | fgrep -v grep| sed -e "s/^.*\(winlog_[0-9_-]\+\) .*/\1/" | while read a; do echo "open $a"; path=/home/leonid/bin/linux-app-logger/$a; cat $path; echo "===================="; tail -f $path; done 
+ps ax | fgrep "python ./logger.py " | fgrep -v grep| sed -e "s/^.*\(winlog_[0-9_-]\+\).*/\1/" | while read a; do echo "open $a"; path=/home/leonid/worklog/$a; cat $path; echo "===================="; tail -f $path; done 
 

winstartlog

@@ -1,5 +1,5 @@
 #!/bin/sh
 cd /home/leonid/bin/linux-app-logger
 #./logger.py winlog_`ddate` 30 stopfile 2>>2_stream.log
-./logger.py winlog_`date +"%Y-%m-%d"` 15 2>>2_stream.log
+./logger.py ~/worklog 15 2>>2_stream.log
 

winstoplog

@@ -1,2 +1,2 @@
 #!/bin/bash
-ps ax | fgrep "python ./logger.py winlog" | fgrep -v grep| sed -e "s/^ *\([0-9]\+\) .*/\1/" | while read a; do echo "killing $a"; kill -9 $a; done
+ps ax | fgrep "python ./logger.py " | fgrep -v grep| sed -e "s/^ *\([0-9]\+\) .*/\1/" | while read a; do echo "killing $a"; kill -9 $a; done