Merge pull request #261 from griff/fix/pr-build

Fix/pr build

Author: griff

Scripts/plist.bash

@@ -9,7 +9,7 @@ set -x
 PATH=$PATH:/usr/local/bin:/usr/bin:/sw/bin:/opt/local/bin
 buildid=`git log -n1 --pretty=oneline --format=%h`
 release=`cat "$SCRIPT_INPUT_FILE_0"`
-builddate=`date +%y.%m.%d.%H`
+builddate=`date +%y.%m%d.%H%M`
 
 major="$(echo $release | cut -d . -f 1 -)"
 minor="$(echo $release | cut -d . -f 2 -)"
@@ -18,17 +18,20 @@ while git show-ref --tags --quiet --verify -- "refs/tags/v${major}.${minor}" ; d
   ((minor = $minor + 1))
 done
 if [[ -n "$GITHUB_REF" ]]; then
-  if [[ $GITHUB_REF != refs/tags/* ]]; then
-    number="$(git rev-list --count "$GITHUB_REF")"
-    release="${major}.${minor}.beta-$number"
-  else
+  if [[ $GITHUB_REF = refs/tags/* ]]; then
     ((minors = $minor - 1))
     if [[ "$GITHUB_REF" == "refs/tags/v${major}.${minors}" ]]; then
-      release="${major}.${minors}"
+        release="${major}.${minors}"
     else
-      release=${GITHUB_REF#refs/tags/v}
-      #release="${major}.${minor}"
+        release=${GITHUB_REF#refs/tags/v}
+        #release="${major}.${minor}"
     fi
+  elif [[ $GITHUB_REF = refs/pull/* ]]; then
+    number="$(echo "$GITHUB_REF" | awk -F / '{ print $3 }')"
+    release="${major}.${minor}.pr-$number"
+  else
+    number="$(git rev-list --count "$GITHUB_REF")"
+    release="${major}.${minor}.beta-$number"
   fi
 else
   release="${major}.${minor}"