Merge pull request #1755 from nextcloud/updateMasterLint

Update master.html only on master branch

scripts/lint/getBranchName.sh

@@ -2,4 +2,8 @@
 
 # $1: username, $2: password/token, $3: pull request number
 
-curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/android/pulls/$3 | grep \"ref\": | grep -v master | cut -d"\"" -f4
+if [ -z $3 ] ; then
+    echo "master";
+else
+    curl 2>/dev/null -u $1:$2 https://api.github.com/repos/nextcloud/android/pulls/$3 | grep \"ref\": | grep -v master | cut -d"\"" -f4
+fi

scripts/lint/lint-up-wrapper.sh

@@ -10,11 +10,14 @@
 ruby scripts/lint/lint-up.rb $1 $2 $3
 
 returnValue=$?
-if [ $returnValue -eq 0 ]; then
+if [ $3 = "master" ]; then
     echo "New master at: https://nextcloud.kaminsky.me/index.php/s/tXwtChzyqMj6I8v"
     curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/droneLogs/master.html --upload-file build/reports/lint/lint.html
     exit 0
 elif [ $returnValue -eq 1 ]; then
+    if [ -e $6 ] ; then
+        6="master-"$(date +%F)
+    fi
     echo "New results at https://nextcloud.kaminsky.me/index.php/s/tXwtChzyqMj6I8v ->" $6.html
     curl -u $4:$5 -X PUT https://nextcloud.kaminsky.me/remote.php/webdav/droneLogs/$6.html --upload-file build/reports/lint/lint.html
     exit 1