Commit ec2532ac by Calen Pennington

Before starting the server, forcibly rebuild assets before starting to watch them

parent f7cad77b
...@@ -132,7 +132,7 @@ def compile_assets(watch=false) ...@@ -132,7 +132,7 @@ def compile_assets(watch=false)
sass_cmd = "sass --style compressed " + sass_cmd = "sass --style compressed " +
"--load-path ./common/static/sass " + "--load-path ./common/static/sass " +
"--require ./common/static/sass/bourbon/lib/bourbon.rb " + "--require ./common/static/sass/bourbon/lib/bourbon.rb " +
"#{watch ? '--watch' : '--update'} */static" "#{watch ? '--watch' : '--update --force'} */static"
[xmodule_cmd, coffee_cmd, sass_cmd].each do |cmd| [xmodule_cmd, coffee_cmd, sass_cmd].each do |cmd|
if watch if watch
...@@ -245,6 +245,7 @@ end ...@@ -245,6 +245,7 @@ end
desc desc
task system, [:env, :options] => [:predjango] do |t, args| task system, [:env, :options] => [:predjango] do |t, args|
args.with_defaults(:env => 'dev', :options => default_options[system]) args.with_defaults(:env => 'dev', :options => default_options[system])
compile_assets(watch=false)
compile_assets(watch=true) compile_assets(watch=true)
sh(django_admin(system, args.env, 'runserver', args.options)) sh(django_admin(system, args.env, 'runserver', args.options))
end end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment