summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Gemfile4
-rw-r--r--VERSION2
-rwxr-xr-xbin/lazar-start.sh4
-rwxr-xr-xbin/lazar-stop.sh2
-rw-r--r--lazar-gui.gemspec1
5 files changed, 7 insertions, 6 deletions
diff --git a/Gemfile b/Gemfile
index 04e129a..2062f54 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
source "https://rubygems.org"
gemspec
-gem "lazar", :path => "../lazar"
-gem "qsar-report", :path => "../qsar-report"
+gem "lazar"
+gem "qsar-report"
gem "gem-path"
gem "sinatra"
gem "sinatra-reloader"
diff --git a/VERSION b/VERSION
index f0bb29e..3a3cd8c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.0
+1.3.1
diff --git a/bin/lazar-start.sh b/bin/lazar-start.sh
index 9143d02..cf2af36 100755
--- a/bin/lazar-start.sh
+++ b/bin/lazar-start.sh
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
sudo mongod &
R CMD Rserve --vanilla &
LAZARPATH=$(gem path lazar-gui)
cd $LAZARPATH
-unicorn -c unicorn.rb -E production -D
+unicorn -c unicorn.rb -E production
exit 0
diff --git a/bin/lazar-stop.sh b/bin/lazar-stop.sh
index c311584..eea6815 100755
--- a/bin/lazar-stop.sh
+++ b/bin/lazar-stop.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
grep_lazar=`ps aux | grep -v grep | grep lazar-start`
grep_mongo=`ps aux | grep -v grep | grep mongod`
grep_rserve=`ps aux | grep -v grep | grep Rserve`
diff --git a/lazar-gui.gemspec b/lazar-gui.gemspec
index 3a281df..751433e 100644
--- a/lazar-gui.gemspec
+++ b/lazar-gui.gemspec
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency "lazar"
s.add_runtime_dependency "sinatra"
+ s.add_runtime_dependency "sinatra-reloader"
s.add_runtime_dependency "rdiscount"
s.add_runtime_dependency "haml"
s.add_runtime_dependency "sass"