瀏覽代碼

fix typos for wt setup files, move required ruby package install to prerequsites
clean up lapis exports

Lita Gratrix 10 年之前
父節點
當前提交
10826915d7

+ 1 - 1
frameworks/C++/wt/setup_postgres.sh

@@ -7,7 +7,7 @@ export WT_ROOT=${IROOT}/wt
 export WT_LIB=${WT_ROOT}/lib
 export WT_LIB=${WT_ROOT}/lib
 export WT_INC=${WT_ROOT}/include
 export WT_INC=${WT_ROOT}/include
 
 
-export LD_LIBRARY_PATH="${BOOST_LIB}:${WT_LIB}:${LD_LIBRARY_PATH}"pi
+export LD_LIBRARY_PATH="${BOOST_LIB}:${WT_LIB}:${LD_LIBRARY_PATH}"
 
 
 sed -i 's|INSERT_DB_HOST_HERE|'"${DBHOST}"'|g' benchmark.cpp
 sed -i 's|INSERT_DB_HOST_HERE|'"${DBHOST}"'|g' benchmark.cpp
 
 

+ 1 - 2
frameworks/Lua/lapis/setup.sh

@@ -4,8 +4,7 @@ sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' config.lua
 sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' config.moon
 sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' config.moon
 sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' nginx.conf
 sed -i 's|DBHOSTNAME|'"${DBHOST}"'|g' nginx.conf
 
 
-export OPENRESTY_HOME=${IROOT}/openresty-1.7.7.1
 export LAPIS_OPENRESTY=${IROOT}/openresty-1.7.7.1
 export LAPIS_OPENRESTY=${IROOT}/openresty-1.7.7.1
-export PATH=${OPENRESTY_HOME}/nginx/sbin:$PATH
+export PATH=${LAPIS_OPENRESTY}/nginx/sbin:$PATH
 
 
 lapis server production &
 lapis server production &

+ 1 - 1
toolset/setup/linux/frameworks/wt.sh

@@ -40,4 +40,4 @@ make
 make install
 make install
 
 
 cd ..
 cd ..
-touch duda-0.23.installed
+touch wt.installed

+ 3 - 0
toolset/setup/linux/prerequisites.sh

@@ -60,4 +60,7 @@ RETCODE=$(fw_exists ~/.bash_profile.bak)
 
 
 sudo sh -c "echo '*               -    nofile          65535' >> /etc/security/limits.conf"
 sudo sh -c "echo '*               -    nofile          65535' >> /etc/security/limits.conf"
 
 
+#Ensure llvm-dev is installed (required for ruby to install correctly)
+sudo apt-get install llvm-dev
+
 touch fwbm_prereqs_installed
 touch fwbm_prereqs_installed