From 7fb5bc41dd4e6ed3abadfea03326def697813105 Mon Sep 17 00:00:00 2001
From: Pascal <Cirromulus@users.noreply.github.com>
Date: Sat, 30 Jan 2021 14:53:33 +0000
Subject: [PATCH] Added Meteor M2-2

---
 install.sh         | 17 +++++++++++------
 schedule.sh        |  1 +
 schedule_meteor.sh |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/install.sh b/install.sh
index 1ba2335..e25eb14 100755
--- a/install.sh
+++ b/install.sh
@@ -132,12 +132,17 @@ else
 fi
 
 ### install predict
-$orig_dir=$(pwd)
-cd software
-tar -xzf predict-2.2.7.tar.gz
-cd predict-2.2.7
-sudo ./configure	#this also installs :X
-cd $orig_dir
+if [ -e $(which predict) ]; then
+    log_done "predict was already installed"
+else
+    $orig_dir=$(pwd)
+    cd software
+    tar -xzf predict-2.2.7.tar.gz
+    cd predict-2.2.7
+    sudo ./configure	#this also installs :X
+    cd $orig_dir
+    log_done "predict installed"
+fi
 
 ### Install default config file
 if [ -e "$HOME/.noaa.conf" ]; then
diff --git a/schedule.sh b/schedule.sh
index 3fb4c9d..b031bd0 100755
--- a/schedule.sh
+++ b/schedule.sh
@@ -16,6 +16,7 @@ grep "NOAA 15" "${NOAA_HOME}"/predict/weather.txt -A 2 > "${NOAA_HOME}"/predict/
 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
+grep "METEOR-M2 2" "${NOAA_HOME}"/predict/weather.txt -A 2 >> "${NOAA_HOME}"/predict/weather.tle
 if [ "$SCHEDULE_ISS" == "true" ]; then
     grep "ZARYA" "${NOAA_HOME}"/predict/amateur.txt -A 2 > "${NOAA_HOME}"/predict/amateur.tle
 fi
diff --git a/schedule_meteor.sh b/schedule_meteor.sh
index 66208ee..67ca712 100755
--- a/schedule_meteor.sh
+++ b/schedule_meteor.sh
@@ -26,7 +26,7 @@ while [ "$(date --date="@${var2}" +%D)" = "$(date +%D)" ]; do
 	OUTDATE=$(date --date="TZ=\"UTC\" ${START_TIME}" +%Y%m%d-%H%M%S)
 
 	if [ "${MAXELEV}" -gt "${METEOR_MIN_ELEV}" ]; then
-		log "Pass is above ${METEOR_MIN_ELEV}, that is OK for me" "INFO"
+		log "Pass at ${MAXELEV} is above ${METEOR_MIN_ELEV}, that is OK for me" "INFO"
 		SATNAME=$(echo "$1" | sed "s/ //g")
 		echo "${SATNAME}" "${OUTDATE}" "$MAXELEV"
 		echo "${NOAA_HOME}/receive_meteor.sh \"${1}\" $2 ${SATNAME}${OUTDATE} "${NOAA_HOME}"/predict/weather.tle \