From eceba44f1cb9e3c078edd015425a2f1ba1619046 Mon Sep 17 00:00:00 2001
From: davidh-ssec <david.hoese@ssec.wisc.edu>
Date: Wed, 20 Jul 2016 10:27:47 -0500
Subject: [PATCH] Move environment variable to shared metobs_config.sh script
---
scripts/archive_tower.sh | 5 -----
scripts/metobs_config.sh | 4 ++++
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/scripts/archive_tower.sh b/scripts/archive_tower.sh
index 178e309..f132125 100755
--- a/scripts/archive_tower.sh
+++ b/scripts/archive_tower.sh
@@ -8,11 +8,6 @@ SCRIPT_NAME=${SCRIPT_NAME/.sh/}
# Get environment variables and common functions
source $SCRIPT_HOME/metobs_config.sh
-# Assume we are in /data1/software/<site>-<inst>/repos/git/<Site><Inst>/scripts
-# and need to get to /data1/software/<site-<inst>
-ENV=`readlink -f ../../../../`
-LOGDIR=$ENV/logs
-
DATE=$1
if [ -z "$DATE" ]; then
DATE=`date +%Y%m%d`
diff --git a/scripts/metobs_config.sh b/scripts/metobs_config.sh
index ee1aa03..502a660 100644
--- a/scripts/metobs_config.sh
+++ b/scripts/metobs_config.sh
@@ -7,6 +7,10 @@ export TOWER_INCOMING_DIR=/mnt/inst-data/incoming/aoss/tower
export TOWER_PRAW_DIR=/mnt/inst-data/raw/aoss/tower
# Where generated products go
export TOWER_CACHE_DIR=/mnt/inst-data/cache/aoss/tower
+# Python environment to use and where scripts are location
+export ENV=/data1/software/aoss-tower3
+# Directory where logs will be stored
+export LOGDIR=$ENV/logs
log_info() {
echo "INFO: $*" &>> $logfile
--
GitLab