From 40e59a1c09b984860fe0838310255df1e7440fec Mon Sep 17 00:00:00 2001
From: Nico Rey <rey.nico@gmail.com>
Date: Sun, 23 Aug 2020 14:42:23 -0300
Subject: [PATCH] Standarize library import

---
 common.sh          | 2 +-
 prune.sh           | 3 ++-
 schedule.sh        | 4 ++--
 schedule_meteor.sh | 4 ++--
 schedule_sat.sh    | 4 ++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/common.sh b/common.sh
index fb8cdd3..b24f3dd 100755
--- a/common.sh
+++ b/common.sh
@@ -3,7 +3,7 @@
 ## debug
 # set -x
 
-. ~/.noaa.conf
+. "$HOME/.noaa.conf"
 
 declare -A levels=([DEBUG]=0 [INFO]=1 [WARN]=2 [ERROR]=3)
 log_level=${LOG_LEVEL}
diff --git a/prune.sh b/prune.sh
index 980d33a..31109c8 100755
--- a/prune.sh
+++ b/prune.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 ## import common lib
-. ~/common.sh
+. "$HOME/.noaa.conf"
+. "$NOAA_HOME/common.sh"
 
 find "${NOAA_HOME}/map/" -type f -name '*.png' -mtime +1 -exec rm -f {} \;
 log "${NOAA_HOME}/map/ folder pruned" "INFO"
diff --git a/schedule.sh b/schedule.sh
index d27a988..6496142 100755
--- a/schedule.sh
+++ b/schedule.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 ## import common lib
-. ~/.noaa.conf
-. "${NOAA_HOME}"/common.sh
+. "$HOME/.noaa.conf"
+. "$NOAA_HOME/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
diff --git a/schedule_meteor.sh b/schedule_meteor.sh
index d63bc9c..ffc5f45 100755
--- a/schedule_meteor.sh
+++ b/schedule_meteor.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 ## import common lib
-. ~/.noaa.conf
-. "${NOAA_HOME}"/common.sh
+. "$HOME/.noaa.conf"
+. "$NOAA_HOME/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)
diff --git a/schedule_sat.sh b/schedule_sat.sh
index 8ea049f..db2fddf 100755
--- a/schedule_sat.sh
+++ b/schedule_sat.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 ## import common lib
-. ~/.noaa.conf
-. "${NOAA_HOME}"/common.sh
+. "$HOME/.noaa.conf"
+. "$NOAA_HOME/common.sh"
 
 # $1 = Satellite Name
 # $2 = Frequency