Move Predict and Config Backups to Tmp Directory

Organize a bit more around temporary/ephemeral files.
nikolagor · Jan 28, 2021 · 013b39d · 013b39d
1 parent e2bc53c
commit 013b39d
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,2 @@
-predict/
-map/
-panel.db
+# ansible retry files
+*.retry
diff --git a/schedule.sh b/schedule.sh
@@ -10,14 +10,14 @@ fi
 . "$HOME/.noaa.conf"
 . "$NOAA_HOME/scripts/common.sh"
 
-wget -qr http://www.celestrak.com/NORAD/elements/weather.txt -O "${NOAA_HOME}"/predict/weather.txt
-wget -qr http://www.celestrak.com/NORAD/elements/amateur.txt -O "${NOAA_HOME}"/predict/amateur.txt
-grep "NOAA 15" "${NOAA_HOME}"/predict/weather.txt -A 2 > "${NOAA_HOME}"/predict/weather.tle
-grep "NOAA 18" "${NOAA_HOME}"/predict/weather.txt -A 2 >> "${NOAA_HOME}"/predict/weather.tle
-grep "NOAA 19" "${NOAA_HOME}"/predict/weather.txt -A 2 >> "${NOAA_HOME}"/predict/weather.tle
-grep "METEOR-M 2" "${NOAA_HOME}"/predict/weather.txt -A 2 >> "${NOAA_HOME}"/predict/weather.tle
+wget -qr http://www.celestrak.com/NORAD/elements/weather.txt -O "${NOAA_HOME}"/tmp/predict/weather.txt
+wget -qr http://www.celestrak.com/NORAD/elements/amateur.txt -O "${NOAA_HOME}"/tmp/predict/amateur.txt
+grep "NOAA 15" "${NOAA_HOME}"/tmp/predict/weather.txt -A 2 > "${NOAA_HOME}"/tmp/predict/weather.tle
+grep "NOAA 18" "${NOAA_HOME}"/tmp/predict/weather.txt -A 2 >> "${NOAA_HOME}"/tmp/predict/weather.tle
+grep "NOAA 19" "${NOAA_HOME}"/tmp/predict/weather.txt -A 2 >> "${NOAA_HOME}"/tmp/predict/weather.tle
+grep "METEOR-M 2" "${NOAA_HOME}"/tmp/predict/weather.txt -A 2 >> "${NOAA_HOME}"/tmp/predict/weather.tle
 if [ "$SCHEDULE_ISS" == "true" ]; then
-    grep "ZARYA" "${NOAA_HOME}"/predict/amateur.txt -A 2 > "${NOAA_HOME}"/predict/amateur.tle
+    grep "ZARYA" "${NOAA_HOME}"/tmp/predict/amateur.txt -A 2 > "${NOAA_HOME}"/tmp/predict/amateur.tle
 fi
 
 #Remove all AT jobs

diff --git a/scripts/common.sh b/scripts/common.sh
@@ -51,6 +51,6 @@ if [ ! -d "${NOAA_HOME}/map/" ]; then
 	mkdir -m 775 -p "${NOAA_HOME}/map/"
 fi
 
-if [ ! -d "${NOAA_HOME}/predict/" ]; then
-	mkdir -m 775 -p "${NOAA_HOME}/predict/"
+if [ ! -d "${NOAA_HOME}/tmp/predict/" ]; then
+	mkdir -m 775 -p "${NOAA_HOME}/tmp/predict/"
 fi
diff --git a/scripts/schedule_iss.sh b/scripts/schedule_iss.sh
@@ -10,13 +10,13 @@ fi
 . "$HOME/.noaa.conf"
 . "$NOAA_HOME/scripts/common.sh"
 
-PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/amateur.tle -p "${1}" | head -1)
-PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/amateur.tle -p "${1}" | tail -1)
+PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/amateur.tle -p "${1}" | head -1)
+PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/amateur.tle -p "${1}" | tail -1)
 
 
 var2=$(echo "${PREDICTION_END}" | cut -d " " -f 1)
 
-MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/amateur.tle -p "${1}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
+MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/amateur.tle -p "${1}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
 
 while [ "$(date --date="@${var2}" +%D)" = "$(date +%D)" ]; do
 	START_TIME=$(echo "$PREDICTION_START" | cut -d " " -f 3-4)
@@ -29,14 +29,14 @@ while [ "$(date --date="@${var2}" +%D)" = "$(date +%D)" ]; do
 	then
 		SATNAME=$(echo "$1" | sed "s/ //g")
 		echo ${SATNAME} "${OUTDATE}" "$MAXELEV"
-		echo "${NOAA_HOME}/scripts/receive_iss.sh \"${1}\" $2 ISS${OUTDATE} "${NOAA_HOME}"/predict/amateur.tle \
+		echo "${NOAA_HOME}/scripts/receive_iss.sh \"${1}\" $2 ISS${OUTDATE} "${NOAA_HOME}"/tmp/predict/amateur.tle \
 ${var1} ${TIMER} ${MAXELEV}" | at "$(date --date="TZ=\"UTC\" ${START_TIME}" +"%H:%M %D")"
 		sqlite3 $DB_HOME/panel.db "insert or replace into predict_passes (sat_name,pass_start,pass_end,max_elev,is_active) values (\"$SATNAME\",$var1,$var2,$MAXELEV,1);"
 	fi
 	NEXTPREDICT=$(expr "${var2}" + 60)
-	PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/amateur.tle -p "${1}" "${NEXTPREDICT}" | head -1)
-	PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/amateur.tle -p "${1}"  "${NEXTPREDICT}" | tail -1)
-	MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/amateur.tle -p "${1}" "${NEXTPREDICT}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
+	PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/amateur.tle -p "${1}" "${NEXTPREDICT}" | head -1)
+	PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/amateur.tle -p "${1}"  "${NEXTPREDICT}" | tail -1)
+	MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/amateur.tle -p "${1}" "${NEXTPREDICT}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
 	var2=$(echo "${PREDICTION_END}" | cut -d " " -f 1)
 done
 
diff --git a/scripts/schedule_meteor.sh b/scripts/schedule_meteor.sh
@@ -10,12 +10,12 @@ fi
 . "$HOME/.noaa.conf"
 . "$NOAA_HOME/scripts/common.sh"
 
-PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" | head -1)
-PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" | tail -1)
+PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}" | head -1)
+PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}" | tail -1)
 
 var2=$(echo "${PREDICTION_END}" | cut -d " " -f 1)
 
-MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
+MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
 
 while [ "$(date --date="@${var2}" +%D)" = "$(date +%D)" ]; do
 	log "Pass prediction in progress" "INFO"
@@ -29,14 +29,14 @@ while [ "$(date --date="@${var2}" +%D)" = "$(date +%D)" ]; do
 		log "Pass is above ${METEOR_MIN_ELEV}, that is OK for me" "INFO"
 		SATNAME=$(echo "$1" | sed "s/ //g")
 		echo "${SATNAME}" "${OUTDATE}" "$MAXELEV"
-		echo "${NOAA_HOME}/scripts/receive_meteor.sh \"${1}\" $2 ${SATNAME}${OUTDATE} "${NOAA_HOME}"/predict/weather.tle \
+		echo "${NOAA_HOME}/scripts/receive_meteor.sh \"${1}\" $2 ${SATNAME}${OUTDATE} "${NOAA_HOME}"/tmp/predict/weather.tle \
 ${var1} ${TIMER} ${MAXELEV}" | at "$(date --date="TZ=\"UTC\" ${START_TIME}" +"%H:%M %D")"
 		sqlite3 $DB_HOME/panel.db "insert or replace into predict_passes (sat_name,pass_start,pass_end,max_elev,is_active) values (\"$SATNAME\",$var1,$var2,$MAXELEV,1);"
 	fi
 	NEXTPREDICT=$(expr "${var2}" + 60)
-	PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" "${NEXTPREDICT}" | head -1)
-	PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}"  "${NEXTPREDICT}" | tail -1)
-	MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" "${NEXTPREDICT}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
+	PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}" "${NEXTPREDICT}" | head -1)
+	PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}"  "${NEXTPREDICT}" | tail -1)
+	MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}" "${NEXTPREDICT}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
 	var2=$(echo "${PREDICTION_END}" | cut -d " " -f 1)
 done
 
diff --git a/scripts/schedule_sat.sh b/scripts/schedule_sat.sh
@@ -18,12 +18,12 @@ fi
 # $6 = Time to capture
 # $7 = Satellite max elevation
 
-PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" | head -1)
-PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" | tail -1)
+PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}" | head -1)
+PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}" | tail -1)
 
 var2=$(echo "${PREDICTION_END}" | cut -d " " -f 1)
 
-MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
+MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
 
 while [ "$(date --date="@${var2}" +%D)" = "$(date +%D)" ]; do
 	START_TIME=$(echo "$PREDICTION_START" | cut -d " " -f 3-4)
@@ -35,14 +35,14 @@ while [ "$(date --date="@${var2}" +%D)" = "$(date +%D)" ]; do
 	if [ "${MAXELEV}" -gt "${SAT_MIN_ELEV}" ]; then
 		SATNAME=$(echo "$1" | sed "s/ //g")
 		echo "${SATNAME}" "${OUTDATE}" "$MAXELEV"
-		echo "${NOAA_HOME}/scripts/receive.sh \"${1}\" $2 ${SATNAME}${OUTDATE} "${NOAA_HOME}"/predict/weather.tle \
+		echo "${NOAA_HOME}/scripts/receive.sh \"${1}\" $2 ${SATNAME}${OUTDATE} "${NOAA_HOME}"/tmp/predict/weather.tle \
 ${var1} ${TIMER} ${MAXELEV}" | at "$(date --date="TZ=\"UTC\" ${START_TIME}" +"%H:%M %D")"
 		sqlite3 $DB_HOME/panel.db "insert or replace into predict_passes (sat_name,pass_start,pass_end,max_elev,is_active) values (\"$SATNAME\",$var1,$var2,$MAXELEV, 1);"
 	fi
 	NEXTPREDICT=$(expr "${var2}" + 60)
-	PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" "${NEXTPREDICT}" | head -1)
-	PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}"  "${NEXTPREDICT}" | tail -1)
-	MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/predict/weather.tle -p "${1}" "${NEXTPREDICT}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
+	PREDICTION_START=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}" "${NEXTPREDICT}" | head -1)
+	PREDICTION_END=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}"  "${NEXTPREDICT}" | tail -1)
+	MAXELEV=$(/usr/bin/predict -t "${NOAA_HOME}"/tmp/predict/weather.tle -p "${1}" "${NEXTPREDICT}" | awk -v max=0 '{if($5>max){max=$5}}END{print max}')
 	var2=$(echo "${PREDICTION_END}" | cut -d " " -f 1)
 done
 
diff --git a/bak/.gitignore → tmp/.gitignore b/bak/.gitignore → tmp/.gitignore
diff --git a/update_webpanel.sh b/update_webpanel.sh
@@ -50,7 +50,7 @@ log "1/$STEPS: Composer install/check done" "INFO"
 
 log "2/$STEPS: Backing up PHP config file..." "INFO"
 if [ -f "$WEB_HOME/App/Config.php" ]; then
-    cp $WEB_HOME/App/Config.php $NOAA_HOME/bak/Config.php.backup
+    cp $WEB_HOME/App/Config.php $NOAA_HOME/tmp/config_backups/Config.php.backup
     log "  Backed up config file to $NOAA_HOME/bak/Config.php.backup" "INFO"
 else
     log "  Did not find any existing config file - proceeding." "INFO"