refactored doit script
authorstephen
Fri, 13 Jan 2017 15:22:18 +0000
changeset 58bb841b98b16
parent 4 d00a4faad5f7
child 6 85d4bf11af35
refactored doit script
battery.log
daily/loradtn-2017-01-13.png
doit.sh
loradtn.png
sedded-battery.log
     1.1 Binary file battery.log has changed
     2.1 Binary file daily/loradtn-2017-01-13.png has changed
     3.1 --- a/doit.sh	Fri Jan 13 13:10:05 2017 +0000
     3.2 +++ b/doit.sh	Fri Jan 13 15:22:18 2017 +0000
     3.3 @@ -1,9 +1,11 @@
     3.4  #!/bin/bash
     3.5  
     3.6 -set -x
     3.7 +#set -x
     3.8  
     3.9 -if [ "$1" != "noup" ]
    3.10 +if [[ "${@/noup}" != "$@" ]]
    3.11  then
    3.12 +	echo "no update attempted"
    3.13 +else
    3.14  	state=`./checkup.sh`
    3.15  
    3.16  	if [ "$state" == "up" ]
    3.17 @@ -13,14 +15,11 @@
    3.18  		./battery-seds.sh battery.log >sedded-battery.log
    3.19  	else 
    3.20  		echo "Node not up."
    3.21 +		exit
    3.22  	fi
    3.23 -else
    3.24 -	./battery-seds.sh battery.log >sedded-battery.log
    3.25 -	gnuplot loradtn.gpl
    3.26 -	exit
    3.27  fi
    3.28  
    3.29 -if [ "$1" == "today" ]
    3.30 +if [[ "${@/today}" != "$@" ]]
    3.31  then
    3.32  	today=`date --rfc-3339=date`
    3.33  	cat loradtn.gpl \
    3.34 @@ -31,22 +30,26 @@
    3.35  	gnuplot daily/loradtn-$today.gpl
    3.36  	mv loradtn-$today.png daily
    3.37  	hg add daily/loradtn-$today.*
    3.38 -else 
    3.39 -	if [ "$1" != "" ]
    3.40 -	then
    3.41 -		# assume parameter is nicely formed date
    3.42 -		theday=$1
    3.43 -		cat loradtn.gpl \
    3.44 -			| sed -e 's/2017-01-01/'$theday'/' \
    3.45 -			| sed -e 's/2017-01-31/'$theday'/' \
    3.46 -			| sed -e 's/loradtn.png/loradtn-'$theday'.png/' \
    3.47 -				>daily/loradtn-$theday.gpl
    3.48 -		gnuplot daily/loradtn-$theday.gpl
    3.49 -		mv loradtn-$theday.png daily
    3.50 -		hg add daily/loradtn-$theday.*
    3.51 -	else
    3.52 -		gnuplot loradtn.gpl
    3.53 -	fi
    3.54 +	exit
    3.55  fi
    3.56  
    3.57 +others="${@/noup}"
    3.58  
    3.59 +if [ "$others" != "" ]
    3.60 +then
    3.61 +	# assume parameter is nicely formed date
    3.62 +	theday=$1
    3.63 +	cat loradtn.gpl \
    3.64 +		| sed -e 's/2017-01-01/'$theday'/' \
    3.65 +		| sed -e 's/2017-01-31/'$theday'/' \
    3.66 +		| sed -e 's/loradtn.png/loradtn-'$theday'.png/' \
    3.67 +			>daily/loradtn-$theday.gpl
    3.68 +	gnuplot daily/loradtn-$theday.gpl
    3.69 +	mv loradtn-$theday.png daily
    3.70 +	hg add daily/loradtn-$theday.*
    3.71 +else
    3.72 +	# generate new overview
    3.73 +	gnuplot loradtn.gpl
    3.74 +fi
    3.75 +
    3.76 +
     4.1 Binary file loradtn.png has changed
     5.1 --- a/sedded-battery.log	Fri Jan 13 13:10:05 2017 +0000
     5.2 +++ b/sedded-battery.log	Fri Jan 13 15:22:18 2017 +0000
     5.3 @@ -901,3 +901,121 @@
     5.4  2017-01-13 13:02:29,1700,pbmd,1273,397,2500,0
     5.5  2017-01-13 13:03:38,1700,pbmd,1273,1674,2500,1
     5.6  2017-01-13 13:04:47,1700,pbmd,1331,1230,2500,0
     5.7 +2017-01-13 13:05:56,1700,pbmd,1325,1452,2500,0
     5.8 +2017-01-13 13:07:05,1700,pbmd,1354,1711,2500,0
     5.9 +2017-01-13 13:08:14,1700,pbmd,1348,1655,2500,0
    5.10 +2017-01-13 13:09:23,1700,pbmd,1351,1637,2500,0
    5.11 +2017-01-13 13:10:32,1700,pbmd,1344,1563,2500,0
    5.12 +2017-01-13 13:11:41,1700,pbmd,1348,1563,2500,0
    5.13 +2017-01-13 13:12:50,1700,pbmd,1345,1544,2500,0
    5.14 +2017-01-13 13:13:59,1700,pbmd,1345,1544,2500,0
    5.15 +2017-01-13 13:15:09,1700,pbmd,1348,1526,2500,0
    5.16 +2017-01-13 13:16:18,1700,pbmd,1345,1563,2500,0
    5.17 +2017-01-13 13:17:27,1700,pbmd,1345,1563,2500,0
    5.18 +2017-01-13 13:18:36,1700,pbmd,1351,1618,2500,0
    5.19 +2017-01-13 13:19:45,1700,pbmd,1339,1322,2500,0
    5.20 +2017-01-13 13:20:54,1700,pbmd,1344,1618,2500,0
    5.21 +2017-01-13 13:22:03,1700,pbmd,1338,1396,2500,0
    5.22 +2017-01-13 13:23:12,1700,pbmd,1312,971,2500,0
    5.23 +2017-01-13 13:24:21,1700,pbmd,1301,619,2500,0
    5.24 +2017-01-13 13:25:30,1700,pbmd,1273,-46,2500,0
    5.25 +2017-01-13 13:26:39,1700,pbmd,1260,-157,2500,0
    5.26 +2017-01-13 13:27:48,1700,pbmd,1260,-9,2500,0
    5.27 +2017-01-13 13:28:57,1700,pbmd,1260,305,2500,0
    5.28 +2017-01-13 13:30:06,1700,pbmd,1272,564,2500,0
    5.29 +2017-01-13 13:31:15,1700,pbmd,1288,619,2500,0
    5.30 +2017-01-13 13:32:24,1700,pbmd,1293,730,2500,0
    5.31 +2017-01-13 13:33:33,1700,pbmd,1300,730,2500,0
    5.32 +2017-01-13 13:34:42,1700,pbmd,1297,804,2500,0
    5.33 +2017-01-13 13:35:51,1700,pbmd,1297,-1008,2500,0
    5.34 +2017-01-13 13:37:00,1700,pbmd,1295,730,2500,0
    5.35 +2017-01-13 13:38:09,1700,pbmd,1295,730,2500,0
    5.36 +2017-01-13 13:39:18,1700,pbmd,1300,693,2500,0
    5.37 +2017-01-13 13:40:27,1700,pbmd,1294,749,2500,0
    5.38 +2017-01-13 13:41:36,1700,pbmd,1298,730,2500,0
    5.39 +2017-01-13 13:42:45,1700,pbmd,1294,675,2500,0
    5.40 +2017-01-13 13:43:54,1700,pbmd,1295,619,2500,0
    5.41 +2017-01-13 13:45:03,1700,pbmd,1291,638,2500,0
    5.42 +2017-01-13 13:46:13,1700,pbmd,1293,656,2500,0
    5.43 +2017-01-13 13:47:22,1700,pbmd,1294,619,2500,0
    5.44 +2017-01-13 13:48:31,1700,pbmd,1291,27,2500,0
    5.45 +2017-01-13 13:49:40,1700,pbmd,1293,601,2500,0
    5.46 +2017-01-13 13:50:49,1700,pbmd,1293,527,2500,0
    5.47 +2017-01-13 13:51:58,1700,pbmd,1290,564,2500,0
    5.48 +2017-01-13 13:53:07,1700,pbmd,1291,582,2500,0
    5.49 +2017-01-13 13:54:16,1700,pbmd,1290,527,2500,0
    5.50 +2017-01-13 13:55:25,1700,pbmd,1288,490,2500,0
    5.51 +2017-01-13 13:56:34,1700,pbmd,1288,286,2500,0
    5.52 +2017-01-13 13:57:43,1700,pbmd,1284,471,2500,0
    5.53 +2017-01-13 13:58:52,1700,pbmd,1284,471,2500,0
    5.54 +2017-01-13 14:00:01,1700,pbmd,1287,508,2500,0
    5.55 +2017-01-13 14:01:10,1700,pbmd,1287,471,2500,0
    5.56 +2017-01-13 14:02:19,1700,pbmd,1291,471,2500,0
    5.57 +2017-01-13 14:03:28,1700,pbmd,1284,453,2500,0
    5.58 +2017-01-13 14:04:37,1700,pbmd,1282,471,2500,0
    5.59 +2017-01-13 14:05:46,1700,pbmd,1284,508,2500,0
    5.60 +2017-01-13 14:06:55,1700,pbmd,1288,638,2500,0
    5.61 +2017-01-13 14:08:04,1700,pbmd,1301,749,2500,0
    5.62 +2017-01-13 14:09:13,1700,pbmd,1303,804,2500,0
    5.63 +2017-01-13 14:10:22,1700,pbmd,1304,804,2500,0
    5.64 +2017-01-13 14:11:31,1700,pbmd,1303,749,2500,0
    5.65 +2017-01-13 14:12:40,1700,pbmd,1301,767,2500,0
    5.66 +2017-01-13 14:13:49,1700,pbmd,1303,786,2500,0
    5.67 +2017-01-13 14:14:58,1700,pbmd,1306,804,2500,0
    5.68 +2017-01-13 14:16:07,1700,pbmd,1301,786,2500,0
    5.69 +2017-01-13 14:17:16,1700,pbmd,1295,675,2500,0
    5.70 +2017-01-13 14:18:26,1700,pbmd,1297,619,2500,0
    5.71 +2017-01-13 14:19:35,1700,pbmd,1297,619,2500,0
    5.72 +2017-01-13 14:20:44,1700,pbmd,1295,582,2500,0
    5.73 +2017-01-13 14:21:53,1700,pbmd,1295,582,2500,0
    5.74 +2017-01-13 14:23:02,1700,pbmd,1295,619,2500,0
    5.75 +2017-01-13 14:24:11,1700,pbmd,1294,508,2500,0
    5.76 +2017-01-13 14:25:20,1700,pbmd,1295,545,2500,0
    5.77 +2017-01-13 14:26:29,1700,pbmd,1297,601,2500,0
    5.78 +2017-01-13 14:27:38,1700,pbmd,1290,582,2500,0
    5.79 +2017-01-13 14:28:47,1700,pbmd,1294,508,2500,0
    5.80 +2017-01-13 14:29:56,1700,pbmd,1295,508,2500,0
    5.81 +2017-01-13 14:31:05,1700,pbmd,1294,490,2500,0
    5.82 +2017-01-13 14:32:14,1700,pbmd,1294,490,2500,0
    5.83 +2017-01-13 14:33:23,1700,pbmd,1291,508,2500,0
    5.84 +2017-01-13 14:34:32,1700,pbmd,1290,416,2500,0
    5.85 +2017-01-13 14:35:41,1700,pbmd,1288,527,2500,0
    5.86 +2017-01-13 14:36:50,1700,pbmd,1295,527,2500,0
    5.87 +2017-01-13 14:37:59,1700,pbmd,1294,527,2500,0
    5.88 +2017-01-13 14:39:08,1700,pbmd,1293,508,2500,0
    5.89 +2017-01-13 14:40:17,1700,pbmd,1295,434,2500,0
    5.90 +2017-01-13 14:41:26,1700,pbmd,1291,416,2500,0
    5.91 +2017-01-13 14:42:35,1700,pbmd,1291,397,2500,0
    5.92 +2017-01-13 14:43:44,1700,pbmd,1290,434,2500,0
    5.93 +2017-01-13 14:44:53,1700,pbmd,1290,416,2500,0
    5.94 +2017-01-13 14:46:02,1700,pbmd,1285,416,2500,0
    5.95 +2017-01-13 14:47:12,1700,pbmd,1288,416,2500,0
    5.96 +2017-01-13 14:48:21,1700,pbmd,1288,379,2500,0
    5.97 +2017-01-13 14:49:30,1700,pbmd,1290,434,2500,0
    5.98 +2017-01-13 14:50:39,1700,pbmd,1288,397,2500,0
    5.99 +2017-01-13 14:51:48,1700,pbmd,1281,360,2500,0
   5.100 +2017-01-13 14:52:57,1700,pbmd,1282,342,2500,0
   5.101 +2017-01-13 14:54:06,1700,pbmd,1281,286,2500,0
   5.102 +2017-01-13 14:55:15,1700,pbmd,1282,286,2500,0
   5.103 +2017-01-13 14:56:24,1700,pbmd,1282,323,2500,0
   5.104 +2017-01-13 14:57:33,1700,pbmd,1276,83,2500,0
   5.105 +2017-01-13 14:58:42,1700,pbmd,1249,-712,2500,0
   5.106 +2017-01-13 14:59:51,1700,pbmd,1237,-897,2500,0
   5.107 +2017-01-13 15:01:00,1700,pbmd,1235,-804,2500,0
   5.108 +2017-01-13 15:02:09,1700,pbmd,1232,-897,2500,0
   5.109 +2017-01-13 15:03:18,1700,pbmd,1230,-971,2500,0
   5.110 +2017-01-13 15:04:27,1700,pbmd,1230,-860,2500,0
   5.111 +2017-01-13 15:05:37,1700,pbmd,1230,-841,2500,0
   5.112 +2017-01-13 15:06:46,1700,pbmd,1228,-952,2500,0
   5.113 +2017-01-13 15:07:55,1700,pbmd,1227,-897,2500,0
   5.114 +2017-01-13 15:09:04,1700,pbmd,1225,-878,2500,0
   5.115 +2017-01-13 15:10:13,1700,pbmd,1224,-897,2500,0
   5.116 +2017-01-13 15:11:22,1700,pbmd,1224,-897,2500,0
   5.117 +2017-01-13 15:12:31,1700,pbmd,1224,-934,2500,0
   5.118 +2017-01-13 15:13:40,1700,pbmd,1224,-841,2500,0
   5.119 +2017-01-13 15:14:49,1700,pbmd,1222,-915,2500,0
   5.120 +2017-01-13 15:15:58,1700,pbmd,1228,-897,2500,0
   5.121 +2017-01-13 15:17:07,1700,pbmd,1219,-952,2500,0
   5.122 +2017-01-13 15:18:16,1700,pbmd,1221,-971,2500,0
   5.123 +2017-01-13 15:19:25,1700,pbmd,1219,-878,2500,0
   5.124 +2017-01-13 15:20:34,1700,pbmd,1221,-971,2500,0