Permalink
Browse files

use makefile instead of individual scripts

  • Loading branch information...
aehlke committed Dec 11, 2012
1 parent 4d9c524 commit 9afa0a829ba0cf3e676b9c61a352629c692cbcb6
Showing with 19 additions and 18 deletions.
  1. +1 −1 .githooks/post-commit
  2. +1 −1 .githooks/pre-commit
  3. +17 −0 Makefile
  4. +0 −7 minify.sh
  5. +0 −9 update_gh_pages.sh
View
@@ -6,5 +6,5 @@ if [ -a .commit ]; then
git commit --amend -C HEAD --no-verify -q
fi
-./update_gh_pages.sh
+make gh-pages
View
@@ -1,6 +1,6 @@
#!/bin/sh
-./minify.sh
+make
touch .commit
View
@@ -0,0 +1,17 @@
+JS=./js/tag-it.js
+MINIFIED_OUTPUT=./js/tag-it.min.js
+
+build:
+ @echo
+ @echo "Compiling JS..."
+ @curl --progress-bar -f -d compilation_level=SIMPLE_OPTIMIZATIONS -d output_format=text -d output_info=compiled_code --data-urlencode "js_code@${JS}" https://closure-compiler.appspot.com/compile -o ${MINIFIED_OUTPUT}
+
+gh-pages:
+ @echo "Updating GitHub pages..."
+ @if git checkout gh-pages -q; then \
+ git merge master -Xtheirs && \
+ git checkout master -q; \
+ fi
+
+.PHONY: gh-pages
+
View
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-echo "Compiling JS..."
-JS=./js/tag-it.js
-MINIFIED_OUTPUT=./js/tag-it.min.js
-curl --progress-bar -f -d compilation_level=SIMPLE_OPTIMIZATIONS -d output_format=text -d output_info=compiled_code --data-urlencode "js_code@${JS}" https://closure-compiler.appspot.com/compile -o $MINIFIED_OUTPUT
-
View
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-echo
-echo "Updating GitHub pages..."
-if git checkout gh-pages -q; then
- git merge master -Xtheirs
- git checkout master -q
-fi
-

0 comments on commit 9afa0a8

Please sign in to comment.