diff --git a/bin/compile.sh b/bin/compile.sh index 1385755..1583ecc 100755 --- a/bin/compile.sh +++ b/bin/compile.sh @@ -4,7 +4,7 @@ set -e DIR=$(dirname "$0") -HARP="harp" +HARP="node_modules/harp/bin/harp" TARGET="${1:-www}" function main() { @@ -19,14 +19,14 @@ function main() { munge_html echo "* inline CSS" - $DIR/inline-css.rb "$TARGET" + ruby -w $DIR/inline-css.rb "$TARGET" echo "* minify js" minify_js } function compile_rss() { - $DIR/rss.rb public + ruby -w $DIR/rss.rb public } function munge_html() { diff --git a/bin/inline-css.rb b/bin/inline-css.rb index 95d1243..5527a3d 100755 --- a/bin/inline-css.rb +++ b/bin/inline-css.rb @@ -1,5 +1,6 @@ -#!/usr/bin/env ruby -w -rrubygems +#!/usr/bin/env ruby -w +require 'rubygems' require 'bundler/setup' require 'nokogiri' require 'css_parser' diff --git a/bin/minify-js.sh b/bin/minify-js.sh index 1c7f806..da9d1ad 100755 --- a/bin/minify-js.sh +++ b/bin/minify-js.sh @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash DIR=$(dirname "$0") -UGLIFY="uglifyjs" +UGLIFY="node_modules/uglify-js/bin/uglifyjs" function minify() { INPUT="$1" diff --git a/bin/rss.rb b/bin/rss.rb index fbe1a48..c50e451 100755 --- a/bin/rss.rb +++ b/bin/rss.rb @@ -1,6 +1,7 @@ -#!/usr/bin/env ruby -w -rrubygems +#!/usr/bin/env ruby -w # encoding: utf-8 +require 'rubygems' require 'time' require 'bundler/setup' require 'builder' diff --git a/package.json b/package.json index 2751064..31b5822 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,9 @@ -{ "name": "samhuri.net", +{ + "name": "samhuri.net", "description": "samhuri.net", "version": "0.0.1", "dependencies": { - "harp": "0.11.x", - "uglify-js": "2.4.x" + "harp": "^0.11.2", + "uglify-js": "^2.4.17" } }