Merge branch 'release-0.1.2'

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.1.2 (2016-08-10)
+  - Explicitly push tags
+  - Better wording to push question
+  - Fix changelog url
+
+[Full changelog](https://github.com/superhelio/tools/compare/0.1.1...0.1.2)
+
+
+## 0.1.1 (2016-08-10)
+  - Echo into the temp file, not to the screen
+
+[Full changelog](https://github.com/superhelio/tools/compare/0.1.0...0.1.1)
+
+
 ## 0.1.0 (2016-08-10)
   - Remove paging from git log, works better for automation
   - Change changelog formatting to simple message

VERSION

@@ -1 +1 @@
-0.1.0
+0.1.2

release.sh

@@ -27,7 +27,7 @@ LATEST_HASH=$(git log --pretty=format:'%h' -n 1)
 
 # Guess our remote url from remote.origin.url (minus .git from the end),
 # change to your github project url. used to create Full changelog link
-PROJECT_URL=$(git config --get remote.origin.url | sed 's/^\.git*//')
+PROJECT_URL=$(git config --get remote.origin.url | sed 's/\.git//')
 
 # current Git branch
 BRANCH_CURRENT=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,')
@@ -118,7 +118,7 @@ echo "$NEW_VERSION" > "$FILE_VERSION"
 echo "## $NEW_VERSION ($NOW)" > tmpfile
 git --no-pager log --pretty=format:"  - %s" --date=short --no-merges "$BASE_STRING"...HEAD >> tmpfile
 echo "" >> tmpfile
-echo "[Full changelog]($PROJECT_URL/compare/$BASE_STRING...$NEW_VERSION)"
+echo "[Full changelog]($PROJECT_URL/compare/$BASE_STRING...$NEW_VERSION)" >> tmpfile
 echo "" >> tmpfile
 echo "" >> tmpfile
 cat "$FILE_CHANGELOG" >> tmpfile
@@ -148,11 +148,12 @@ git merge --no-ff "$BRANCH_RELEASE"
 # Remove release branch
 git branch -d "$BRANCH_RELEASE"
 
-echo -ne "${QUESTION_FLAG} ${CYAN}Push?"
+echo -ne "${QUESTION_FLAG} ${CYAN}Push everything to origin?"
 
 read -r PUSH
 if [[ $PUSH =~ [yY](es)* ]] || [ "$PUSH" = "" ]; then
     git push --all origin
+    git push --tags origin
 fi
 
 echo -e "${NOTICE_FLAG} Done!"