From 16937eaa9b4e643b57d4e91e9094111c3a147082 Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jamiec@benon.com>
Date: Wed, 11 Mar 2020 12:24:37 +1000
Subject: [PATCH] Fix s3 upload grrr

---
 scripts/docs-upload | 51 ++++++++++++++++++++++++++++++++++-----------
 1 file changed, 39 insertions(+), 12 deletions(-)

diff --git a/scripts/docs-upload b/scripts/docs-upload
index e2bbdc83..0f3761d1 100755
--- a/scripts/docs-upload
+++ b/scripts/docs-upload
@@ -10,19 +10,46 @@ RESET='\E[0m'
 
 echo -e "${BLUE}❯ ${CYAN}Uploading docs in: ${YELLOW}$1${RESET}"
 
-for DIR in $1
-do
-	PARAM_STRING="--guess-mime-type"
-	if [ "$DIR" == "css" ]; then
-		PARAM_STRING="-m text/css"
-	elif [ "$DIR" == "js" ]; then
-		PARAM_STRING="-m application/javascript"
-	elif [[ "$DIR" == *html ]]; then
-		PARAM_STRING="-m text/html"
-	fi
+cd "$1" || exit 1
+ALL_FILES=$(find . -follow)
 
-	s3cmd -v -f -P "$PARAM_STRING" --add-header="Cache-Control:public,max-age=604800" sync "$DIR" "s3://$S3_BUCKET/"
-	rc=$?; if [ $rc != 0 ]; then exit $rc; fi
+for FILE in $ALL_FILES
+do
+	# remove preceeding ./
+	FILE=$(echo "$FILE" | sed -E "s/\.\///g")
+	echo '======================================='
+	echo "FILE: $FILE"
+
+	if [[ -d $FILE ]]; then
+		echo "Skipping $FILE because it's a directory"
+	elif [[ -f $FILE ]]; then
+		PARAM_STRING="--guess-mime-type"
+		EXT="${FILE##*.}"
+		if [ "$EXT" == "css" ]; then
+			PARAM_STRING="-mtext/css"
+		elif [ "$EXT" == "js" ]; then
+			PARAM_STRING="-mapplication/javascript"
+		elif [[ "$EXT" == "html" ]]; then
+			PARAM_STRING="-mtext/html"
+		elif [[ "$EXT" == "png" ]]; then
+			PARAM_STRING="-mimage/png"
+		elif [[ "$EXT" == "jpg" ]]; then
+			PARAM_STRING="-mimage/jpg"
+		elif [[ "$EXT" == "svg" ]]; then
+			PARAM_STRING="-mimage/svg+xml"
+		fi
+
+		DEST_FOLDER=$(dirname "$FILE")
+		if [ "$DEST_FOLDER" == "." ]; then
+			DEST_FOLDER=
+		else
+			DEST_FOLDER="${DEST_FOLDER}/"
+		fi
+
+		echo s3cmd -v -f -P "$PARAM_STRING" --add-header="Cache-Control:public,max-age=604800" sync "$FILE" "s3://$S3_BUCKET/$DEST_FOLDER"
+		s3cmd -v -f -P "$PARAM_STRING" --add-header="Cache-Control:public,max-age=604800" sync "$FILE" "s3://$S3_BUCKET/$DEST_FOLDER"
+		rc=$?; if [ $rc != 0 ]; then exit $rc; fi
+	fi
 done
 
 echo -e "${BLUE}❯ ${GREEN}Upload Complete${RESET}"