Merge branch 'LatestUploadScript' into 'pregmod-master'

Upload script changes

See merge request !2580

devTools/AutoGitVersionUploadBackground.sh

-#!/bin/sh Requires MEGAcmd, git, mv, cd, mkidr, echo
-COUNTER=0 LocalDir=~/fc-pregmod/ RemoteDir=FC-GIT U=anon@anon.anon P=13245 && mega-login $U $P
-while [ $COUNTER -ge 0 ]; do
-	if [ $COUNTER -eq 0 ]; then mega-login $U $P && mega-mkdir $RemoteDir && mega-export -a $RemoteDir && mkdir $LocalDir ; git clone -q https://gitgud.io/pregmodfan/fc-pregmod.git $LocalDir
-	fi	
-	cd $LocalDir/ && AbrevHash=`git log --reverse -n1 --abbrev-commit |grep -m1 commit | sed 's/commit //'`
-	if [ $COUNTER -eq 0 ]; then ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%F-%H-%M')-$AbrevHash.html" && mega-put bin/*.html $RemoteDir
-	else if [ "$(git pull)" == "Already up to date." ]; then ehco -n ""
-		else clear && rm bin/*.html ; ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%F-%H-%M')-$AbrevHash.html" && mega-login $U $P && mega-put bin/*.html $RemoteDir
-		fi
-	fi	
-	let COUNTER=COUNTER+1 && mega-logout > /dev/null && sleep 300s
-done	
+#!/bin/sh Additional packages required: meg	MEGAcmd and git
+V=-1 RD=/Root/FC LD=/tmp/FC U=anon@anon.anon P=13245 Branch=git@ssh.gitgud.io:pregmodfan/fc-pregmod.git ; echo "Fresh clone?" && read VN && clear && mega-login $U $P > /dev/null
+while true; do
+	if [[ $VN == y||$VN == yes ]]; then V=2 && mkdir $LD ; git clone -q $Branch $LD && cd $LD/ && git remote add upstream $Branch
+	elif [[ ($VN == n||$VN == no) || $V == 0 ]]; then cd $LD/ && git fetch -q upstream
+		if  [ `git rev-list HEAD...upstream/pregmod-master --count` != 0 ]; then git pull -q && V=1
+		fi #Check is a slight tweak of https://stackoverflow.com/a/17192101
+	fi
+	if [[ ($V == 2||$V == 1) || $VN == na ]]; then rm bin/*.html ; ./compile > /dev/null && minify -o bin/FC_pregmod.html bin/FC_pregmod.html && mv bin/FC_pregmod.html "bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%d-%m-%Y-%H-%M')-$(git log -n1 --abbrev-commit|grep -m1 commit|sed 's/commit //')".html && mega-put bin/*.html FC/ && mega-ls $RD|sed -n '1!p'|sort -r|tail -n +11|paste -sd " " -|xargs mega-rm > /dev/null && V=0
+	fi
+	clear && sleep 30m
+done 
\ No newline at end of file
\ No newline at end of file

devTools/AutoGitVersionUploadForground.sh

-#!/bin/sh Requires MEGAcmd, git, mv, cd, mkidr, echo
-COUNTER=0 LocalDir=~/fc-pregmod/ RemoteDir=FC-GIT U=anon@anon.anon P=13245 && mega-login $U $P
-while [ $COUNTER -ge 0 ]; do
-	if [ $COUNTER -eq 0 ]; then mega-login $U $P && mega-mkdir $RemoteDir ; mega-export -a $RemoteDir ; mkdir $LocalDir ; git clone -q https://gitgud.io/pregmodfan/fc-pregmod.git $LocalDir
-	fi	
-	cd $LocalDir/ && AbrevHash=`git log -n1 --reverse --abbrev-commit |grep -m1 commit | sed 's/commit //'`
-	if [ $COUNTER -eq 0 ]; then echo "First run. Compliling, formatting and placing .html." && ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%F-%H-%M')-$AbrevHash.html" && mega-put bin/*.html $RemoteDir && echo "Inital compiled .html placed."
-	else if [ "$(git pull)" == "Already up to date." ]; then echo "No updated files."
-		else echo "Compliling, formatting and placing updated .html." ; rm bin/*.html ; ./compile > /dev/null && mv bin/FC_pregmod.html "bin/FC-pregmod-$(git log -1 --format='%cd' --date='format:%F-%H-%M')-$AbrevHash.html" && mega-login $U $P && mega-put bin/*.html $RemoteDir ; echo "Updated .html placed."
-		fi
-	fi	
-	let COUNTER=COUNTER+1 && mega-logout > /dev/null && sleep 300s
-done	
\ No newline at end of file