From b1f468a4dd4a5949c3a279ccd0320e1671813ca9 Mon Sep 17 00:00:00 2001
From: Jon Agland <jon.agland@jisc.ac.uk>
Date: Wed, 23 Sep 2020 21:29:37 +0100
Subject: [PATCH] Update utilities/contacts-from-sf.sh due to changes in the
 salesforce report

See #236
---
 utilities/contacts-from-sf.sh | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/utilities/contacts-from-sf.sh b/utilities/contacts-from-sf.sh
index 18fb219e..dfe0f50f 100755
--- a/utilities/contacts-from-sf.sh
+++ b/utilities/contacts-from-sf.sh
@@ -20,10 +20,11 @@
 # Author: Jon Agland <jon.agland@jisc.ac.uk>
 #
 
-SFREPORTNAME="UKfed-contacts-export"
+UKFDATA=../../ukf-data
 CSVDEST=../../ukf-data/contacts/sf-contacts.csv
 CONTACTDEST=../../ukf-data/contacts/sf-contacts.txt
 MGMTDEST=../../ukf-data/contacts/sf-contacts-mc.txt
+TMPFILE=$(mktemp)
 
 if [ -z "$1" ]; then
      echo "ERROR: No file name supplied"
@@ -35,13 +36,17 @@ if [ ! -f "$1" ]; then
      exit 1
 fi
 
-if ! grep -q \"$SFREPORTNAME\" $1; then
-     echo "ERROR: this doesn't appear to be the output of $SFREPORTNAME"
-     exit 2
-fi
-
 cat $1 | awk -F\, '{ print $1 }' | grep @ | sed -e 's/\"//g' | sort -u  > $CONTACTDEST
 grep "\,\"UK Federation Management Contact\"" $1 | awk -F\, '{ print $1 }' | grep @ | sed -e 's/\"//g' | sort -u  > $MGMTDEST
 
-cp $1 $CSVDEST
+SOURCEDATE=$(date --date="@$(stat $1 --printf=%Y | awk -F\. '{ print $1 }')" +"%d/%m/%Y %H:%M")
+
+
+GITUSER=$(cd $UKFDATA && git config user.name)
+
+cp $1 $TMPFILE
+echo "\"Generated By: $GITUSER $SOURCEDATE\"" >> $TMPFILE
+
+cp $TMPFILE $CSVDEST
+rm $TMPFILE