Merge remote-tracking branch 'pi/hotfixes'

lib/utils.sh

@@ -2,7 +2,12 @@
 # Does nothing if not using stdout
 function usage() {
   if [ -t 1 ]; then
-    grep '^##' "$prog" | sed -e 's/^##\s\?//' -e "s/__PROG__/$me/" 1>&2
+    grep '^##' "$prog" | sed \
+      -e 's/^##\s\?//' \
+      -e "s/__PROG__/$me/" \
+      -e "s|__DEFAULT_WXRX_WEB_PUBDIR__|${WXRX_WEB_PUBDIR:-undefined}|" \
+      -e "s|__DEFAULT_WXRX_WEB_TEMPLATES__|${WXRX_WEB_TEMPLATES:-undefined}|" \
+    1>&2
   fi
 }
 

schedule.sh

@@ -62,7 +62,7 @@ function schedule_pass() {
 
   ${at:-'at'} -q w -t "$(echo $time | cut -d'.' -f1)" <<EOF 2>&1 2>&1 | grep -oP '(?<=job\s)[0-9]+' >> wxrx-jobs
 sleep $(echo ${time} | cut -d'.' -f2)
-wxrx run $(satellite_name_flag "${satellite}") --duration ${duration} >> ./wxrx-log
+wxrx pass $(satellite_name_flag "${satellite}") --duration ${duration} >> ./wxrx-log
 EOF
 }
 

update_satellites.sh

@@ -17,7 +17,7 @@ outfile=${1:-'satellites.tle'}
 
 log "Updating satellite information"
 
-curl https://www.celestrak.com/NORAD/elements/weather.txt 2>/dev/null | \
+curl -L https://www.celestrak.com/NORAD/elements/weather.txt 2>/dev/null | \
   grep 'NOAA 15\|NOAA 18\|NOAA 19' --no-group-separator -A 2 > ${outfile}
 
 if [ $? ]; then