diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..9d49909 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,15 @@ +; This file is for unifying the coding style for different editors and IDEs. +; More information at http://editorconfig.org + +root = true + +[*] +charset = utf-8 +indent_size = 4 +indent_style = space +end_of_line = lf +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false \ No newline at end of file diff --git a/.gitignore b/.gitignore index 57872d0..cac762f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /vendor/ +/.idea/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f8d5f1..1653200 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +## 0.1.5 (2016-08-15) + - Add .editorconfig + - Ignore .idea folder + - Comment out unused variables (unused colors and BRANCH_CURRENT) + - Remove extra new line before Full changelog link + +[Full changelog](https://github.com/superhelio/tools/compare/0.1.4...0.1.5) + + ## 0.1.4 (2016-08-11) - Fix changelog url generation diff --git a/VERSION b/VERSION index 845639e..9faa1b7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.1.4 +0.1.5 diff --git a/release.sh b/release.sh index a1e85fd..d5110a0 100755 --- a/release.sh +++ b/release.sh @@ -17,11 +17,11 @@ NOW="$(date +'%Y-%m-%d')" RED="\033[1;31m" GREEN="\033[0;32m" YELLOW="\033[1;33m" -BLUE="\033[1;34m" -PURPLE="\033[1;35m" +#BLUE="\033[1;34m" +#PURPLE="\033[1;35m" CYAN="\033[1;36m" WHITE="\033[1;37m" -RESET="\033[0m" +#RESET="\033[0m" LATEST_HASH=$(git log --pretty=format:'%h' -n 1) @@ -30,7 +30,7 @@ LATEST_HASH=$(git log --pretty=format:'%h' -n 1) PROJECT_URL=$(git config --get remote.origin.url | sed 's/\.git//' | sed 's/\:/\//' | sed 's/git@/https\:\/\//' | sed 's/\/\/\//\:\/\//') # current Git branch -BRANCH_CURRENT=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,') +#BRANCH_CURRENT=$(git symbolic-ref HEAD | sed -e 's,.*/\(.*\),\1,') # establish branch and tag name variables BRANCH_DEV=develop @@ -131,7 +131,6 @@ fi echo "## $NEW_VERSION ($NOW)" > tmpfile git --no-pager log --pretty=format:" - %s" --date=short --no-merges "$BASE_STRING"...HEAD | sed -n '1!G;h;$p' >> tmpfile echo "" >> tmpfile -echo "" >> tmpfile echo "[Full changelog]($PROJECT_URL/$VER_COMP_STR/$VER_COMP_TAG)" >> tmpfile echo "" >> tmpfile echo "" >> tmpfile