Merge commit 'jsilver/master'

* commit 'jsilver/master':
  fixed win32 sudo incompatibility issue in the rails template
This commit is contained in:
Chris Eppstein 2009-12-31 11:25:55 -08:00
commit 7db51c42b0

View File

@ -50,14 +50,23 @@ gem "haml", :lib => "haml", :version => ">=2.2.0"
gem "chriseppstein-compass", :source => "http://gems.github.com/", :lib => "compass" gem "chriseppstein-compass", :source => "http://gems.github.com/", :lib => "compass"
# install and unpack # install and unpack
rake "gems:install GEM=haml", :sudo => true unless RUBY_PLATFORM =~ /(win|w)32$/ # true if win32, cygwin or mingw32
rake "gems:install GEM=chriseppstein-compass", :sudo => true rake "gems:install GEM=haml", :sudo => true
rake "gems:install GEM=chriseppstein-compass", :sudo => true
else
rake "gems:install GEM=haml"
rake "gems:install GEM=chriseppstein-compass"
end
rake "gems:unpack GEM=chriseppstein-compass" rake "gems:unpack GEM=chriseppstein-compass"
# load any compass framework plugins # load any compass framework plugins
if css_framework =~ /960/ if css_framework =~ /960/
gem "chriseppstein-compass-960-plugin", :source => "http://gems.github.com", :lib => "ninesixty" gem "chriseppstein-compass-960-plugin", :source => "http://gems.github.com", :lib => "ninesixty"
unless RUBY_PLATFORM =~ /(win|w)32$/
rake "gems:install GEM=chriseppstein-compass-960-plugin", :sudo => true rake "gems:install GEM=chriseppstein-compass-960-plugin", :sudo => true
else
rake "gems:install GEM=chriseppstein-compass-960-plugin"
end
rake "gems:unpack GEM=chriseppstein-compass-960-plugin" rake "gems:unpack GEM=chriseppstein-compass-960-plugin"
css_framework = "960" # rename for command css_framework = "960" # rename for command
plugin_require = "-r ninesixty" plugin_require = "-r ninesixty"