diff options
| -rwxr-xr-x | script/rails-post-deploy | 2 | ||||
| -rwxr-xr-x | script/request-creation-graph | 14 | ||||
| -rwxr-xr-x | script/user-use-graph | 14 |
3 files changed, 15 insertions, 15 deletions
diff --git a/script/rails-post-deploy b/script/rails-post-deploy index 046445070..b66c95089 100755 --- a/script/rails-post-deploy +++ b/script/rails-post-deploy @@ -22,7 +22,7 @@ cd app/.. # read config file in for later (STAGING_SITE) if [ -e "config/general" ] then - . ../shlib/deployfns + . commonlib/shlib/deployfns read_conf config/general else OPTION_DOMAIN=127.0.0.1:3000 diff --git a/script/request-creation-graph b/script/request-creation-graph index 186626d7c..3b7741ee2 100755 --- a/script/request-creation-graph +++ b/script/request-creation-graph @@ -16,14 +16,14 @@ LW=4 #EXTENSION=".svg" cd `dirname $0` -cd ../../ -source shlib/deployfns +cd ../ +source commonlib/shlib/deployfns # XXX this is nasty :) -OPTION_FOI_DB_HOST=`grep "host:" foi/config/database.yml | head --lines=1 | cut -d ":" -f 2` -OPTION_FOI_DB_PORT=`grep "port:" foi/config/database.yml | head --lines=1 | cut -d ":" -f 2` -OPTION_FOI_DB_NAME=`grep "database:" foi/config/database.yml | head --lines=1 | cut -d ":" -f 2` -OPTION_FOI_DB_USER=`grep "username:" foi/config/database.yml | head --lines=1 | cut -d ":" -f 2` +OPTION_FOI_DB_HOST=`grep "host:" config/database.yml | head --lines=1 | cut -d ":" -f 2` +OPTION_FOI_DB_PORT=`grep "port:" config/database.yml | head --lines=1 | cut -d ":" -f 2` +OPTION_FOI_DB_NAME=`grep "database:" config/database.yml | head --lines=1 | cut -d ":" -f 2` +OPTION_FOI_DB_USER=`grep "username:" config/database.yml | head --lines=1 | cut -d ":" -f 2` SOURCEA=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM SOURCEB=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM @@ -120,6 +120,6 @@ END #echo "gpscript $GPSCRIPT" export GDFONTPATH=/usr/share/fonts/truetype/ttf-bitstream-vera -gnuplot < $GPSCRIPT > foi/public/foi-live-creation$EXTENSION +gnuplot < $GPSCRIPT > public/foi-live-creation$EXTENSION diff --git a/script/user-use-graph b/script/user-use-graph index 9f511c55b..4e5876239 100755 --- a/script/user-use-graph +++ b/script/user-use-graph @@ -15,14 +15,14 @@ EXTENSION=".png" #EXTENSION=".svg" cd `dirname $0` -cd ../../ -source shlib/deployfns +cd ../ +source commonlib/shlib/deployfns # XXX this is nasty :) -OPTION_FOI_DB_HOST=`grep "host:" foi/config/database.yml | head --lines=1 | cut -d ":" -f 2` -OPTION_FOI_DB_PORT=`grep "port:" foi/config/database.yml | head --lines=1 | cut -d ":" -f 2` -OPTION_FOI_DB_NAME=`grep "database:" foi/config/database.yml | head --lines=1 | cut -d ":" -f 2` -OPTION_FOI_DB_USER=`grep "username:" foi/config/database.yml | head --lines=1 | cut -d ":" -f 2` +OPTION_FOI_DB_HOST=`grep "host:" config/database.yml | head --lines=1 | cut -d ":" -f 2` +OPTION_FOI_DB_PORT=`grep "port:" config/database.yml | head --lines=1 | cut -d ":" -f 2` +OPTION_FOI_DB_NAME=`grep "database:" config/database.yml | head --lines=1 | cut -d ":" -f 2` +OPTION_FOI_DB_USER=`grep "username:" config/database.yml | head --lines=1 | cut -d ":" -f 2` SOURCEA=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM SOURCEB=/tmp/foi-creation-rate-graph-data-$RANDOM$RANDOM @@ -79,5 +79,5 @@ END #echo "gpscript $GPSCRIPT" export GDFONTPATH=/usr/share/fonts/truetype/ttf-bitstream-vera -gnuplot < $GPSCRIPT > foi/public/foi-user-use$EXTENSION +gnuplot < $GPSCRIPT > public/foi-user-use$EXTENSION |