summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Beauchamp <daniel.beauchamp@shopify.com>2014-05-30 14:35:34 -0400
committerDaniel Beauchamp <daniel.beauchamp@shopify.com>2014-05-30 14:35:34 -0400
commit9ee7f9edfb5cc213e0890d9dc248f0ffb7de6798 (patch)
tree4140cb3516a09aed594ae8be344a25b5d5b0030c
parent81ef43d11ba961934df10b2d4ddd2e877021eebc (diff)
parentd3ccecb096821b2df3b492dd349e5c650929a591 (diff)
Merge pull request #366 from Shopify/prevent_double_load
Prevent running the scheduler twice.
-rwxr-xr-xbin/dashing3
-rw-r--r--lib/dashing.rb2
2 files changed, 3 insertions, 2 deletions
diff --git a/bin/dashing b/bin/dashing
index 97a7af5..cce9340 100755
--- a/bin/dashing
+++ b/bin/dashing
@@ -3,6 +3,7 @@ require "pathname"
bin_file = Pathname.new(__FILE__).realpath
$:.unshift File.expand_path("../../lib", bin_file)
-require 'dashing'
+require 'dashing/cli'
+require 'dashing/downloader'
Dashing::CLI.source_root(File.expand_path('../../templates', bin_file))
Dashing::CLI.start(ARGV)
diff --git a/lib/dashing.rb b/lib/dashing.rb
index 855aa36..3527034 100644
--- a/lib/dashing.rb
+++ b/lib/dashing.rb
@@ -3,4 +3,4 @@ require 'dashing/downloader'
require 'dashing/app'
module Dashing
-end
+end \ No newline at end of file