diff --git a/devTools/AutoGitVersionUploadBackground.sh b/devTools/AutoGitVersionUploadBackground.sh index 1f440ee56c5e92203f11f6816de97e6604c41033..3e3a0438237edf1876e8d124ef29be7b3bc4b036 100755 --- a/devTools/AutoGitVersionUploadBackground.sh +++ b/devTools/AutoGitVersionUploadBackground.sh @@ -1,13 +1,12 @@ -#!/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 \ No newline at end of file +#!/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 diff --git a/devTools/AutoGitVersionUploadForground.sh b/devTools/AutoGitVersionUploadForground.sh deleted file mode 100755 index 1dd3ac6f93934f3ae74568bb3a6a4e4a98439193..0000000000000000000000000000000000000000 --- a/devTools/AutoGitVersionUploadForground.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/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