From f64f482462b697e06a47ad55aa5447dc829ce727 Mon Sep 17 00:00:00 2001
From: Instrumental <jonathan.gathman@att.com>
Date: Tue, 30 Apr 2019 10:19:21 -0500
Subject: Clean LOCAL Dir based on VERSION

Issue-ID: AAF-821
Change-Id: I5fde81467d46130d3a39de415604c7702fecbaa8
Signed-off-by: Instrumental <jonathan.gathman@att.com>
---
 auth/sample/bin/client.sh  |  8 +++++++-
 auth/sample/bin/service.sh | 10 +++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'auth/sample')

diff --git a/auth/sample/bin/client.sh b/auth/sample/bin/client.sh
index dbf08622..9e3b2fd7 100755
--- a/auth/sample/bin/client.sh
+++ b/auth/sample/bin/client.sh
@@ -114,7 +114,13 @@ if [ ! -e "$DOT_AAF/keyfile" ]; then
 fi
 echo "cat SSO"
 cat ${SSO}
-echo "dog"
+
+# Should we clean up?
+if [ "${VERSION}" != "$(cat ${LOCAL}/VERSION)" ]; then
+  echo "Clean up directory ${LOCAL}"
+  rm -Rf ${LOCAL}/*
+fi
+echo "${VERSION}" > $LOCAL/VERSION
 
 # Only initialize once, automatically...
 if [ ! -e $LOCAL/${NS}.props ]; then
diff --git a/auth/sample/bin/service.sh b/auth/sample/bin/service.sh
index 1a289d35..a4d2aba1 100644
--- a/auth/sample/bin/service.sh
+++ b/auth/sample/bin/service.sh
@@ -105,7 +105,13 @@ if [ ! -e $FILE ]; then
     fi
 fi
 
-# echo "Check keyfile"
+# Should we clean up?
+if [ "${VERSION}" != "$(cat ${LOCAL}/VERSION)" ]; then
+  echo "Clean up directory ${LOCAL}"
+  rm -Rf ${LOCAL}/*
+fi
+echo "${VERSION}" > $LOCAL/VERSION
+
 FILE="$LOCAL/org.osaaf.aaf.p12"
 if [ ! -e $FILE ]; then
     if [ -e $CONFIG/cert/org.osaaf.aaf.p12 ]; then
@@ -157,6 +163,8 @@ if [ ! -e $LOCAL/org.osaaf.aaf.props ]; then
     $JAVA_AGENT config \
 	aaf@aaf.osaaf.org \
         cadi_etc_dir=$LOCAL \
+        cadi_latitude=${cadi_latitude} \
+        cadi_longitude=${cadi_longitude} \
         cadi_prop_files=$CONFIG/local/initialConfig.props:$CONFIG/local/aaf.props:${TMP}
     rm ${TMP}
 
-- 
cgit 1.2.3-korg