Jelajahi Sumber

Apply ERR fix to all dependency installer files

Minor bugs fixed:
- Ruby was triggering ERR trap
- Erlang was untarring nonexistent file
- Composer was being installed into nonexistent directory
- Mono was incorrectly trying to move it's install location
- Yesod now depends on haskell
Hamilton Turner 11 tahun lalu
induk
melakukan
3ebf5530cc
42 mengubah file dengan 115 tambahan dan 101 penghapusan
  1. 2 2
      toolset/setup/linux/frameworks/grails.sh
  2. 2 2
      toolset/setup/linux/frameworks/jester.sh
  3. 2 2
      toolset/setup/linux/frameworks/nawak.sh
  4. 3 3
      toolset/setup/linux/frameworks/onion.sh
  5. 2 2
      toolset/setup/linux/frameworks/play1.sh
  6. 2 2
      toolset/setup/linux/frameworks/play2.sh
  7. 2 2
      toolset/setup/linux/frameworks/siena.sh
  8. 3 5
      toolset/setup/linux/frameworks/treefrog.sh
  9. 2 2
      toolset/setup/linux/frameworks/vertx.sh
  10. 4 4
      toolset/setup/linux/frameworks/wt.sh
  11. 2 0
      toolset/setup/linux/frameworks/yesod.sh
  12. 3 2
      toolset/setup/linux/languages/composer.sh
  13. 2 2
      toolset/setup/linux/languages/dart.sh
  14. 1 0
      toolset/setup/linux/languages/elixir.sh
  15. 2 3
      toolset/setup/linux/languages/erlang.sh
  16. 2 3
      toolset/setup/linux/languages/haskell.sh
  17. 2 2
      toolset/setup/linux/languages/hhvm.sh
  18. 2 2
      toolset/setup/linux/languages/jruby.sh
  19. 4 4
      toolset/setup/linux/languages/mono.sh
  20. 4 4
      toolset/setup/linux/languages/nimrod.sh
  21. 2 2
      toolset/setup/linux/languages/nodejs.sh
  22. 2 2
      toolset/setup/linux/languages/perl.sh
  23. 3 2
      toolset/setup/linux/languages/phalcon.sh
  24. 8 8
      toolset/setup/linux/languages/php.sh
  25. 2 2
      toolset/setup/linux/languages/pypy.sh
  26. 4 4
      toolset/setup/linux/languages/python2.sh
  27. 2 2
      toolset/setup/linux/languages/python3.sh
  28. 3 5
      toolset/setup/linux/languages/racket.sh
  29. 2 2
      toolset/setup/linux/languages/ringojs.sh
  30. 16 2
      toolset/setup/linux/languages/ruby.sh
  31. 2 2
      toolset/setup/linux/languages/urweb.sh
  32. 2 2
      toolset/setup/linux/languages/xsp.sh
  33. 2 2
      toolset/setup/linux/languages/yaf.sh
  34. 2 2
      toolset/setup/linux/systools/leiningen.sh
  35. 2 2
      toolset/setup/linux/systools/maven.sh
  36. 2 2
      toolset/setup/linux/webservers/lapis.sh
  37. 2 2
      toolset/setup/linux/webservers/mongrel2.sh
  38. 2 2
      toolset/setup/linux/webservers/nginx.sh
  39. 2 2
      toolset/setup/linux/webservers/openresty.sh
  40. 2 2
      toolset/setup/linux/webservers/resin.sh
  41. 1 0
      toolset/setup/linux/webservers/weber.sh
  42. 2 2
      toolset/setup/linux/webservers/zeromq.sh

+ 2 - 2
toolset/setup/linux/frameworks/grails.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists grails-2.4.2
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists grails-2.4.2)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://dist.springframework.org.s3.amazonaws.com/release/GRAILS/grails-2.4.2.zip
 unzip -o grails-2.4.2.zip

+ 2 - 2
toolset/setup/linux/frameworks/jester.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_exists jester
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists jester)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 git clone git://github.com/dom96/jester.git jester/jester

+ 2 - 2
toolset/setup/linux/frameworks/nawak.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-fw_exists nawak
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists nawak)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 git clone git://github.com/idlewan/nawak.git nawak/nawak

+ 3 - 3
toolset/setup/linux/frameworks/onion.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 
-fw_exists onion
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists onion)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 git clone https://github.com/davidmoreno/onion.git
 
 
 cd onion
-mkdir build
+mkdir -p build
 cd build
 cmake ..
 make

+ 2 - 2
toolset/setup/linux/frameworks/play1.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists play-1.2.5
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists play-1.2.5)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://downloads.typesafe.com/releases/play-1.2.5.zip -O play-1.2.5.zip
 fw_unzip play-1.2.5.zip

+ 2 - 2
toolset/setup/linux/frameworks/play2.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists play-2.2.0
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists play-2.2.0)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://downloads.typesafe.com/play/2.2.0/play-2.2.0.zip
 fw_unzip play-2.2.0.zip

+ 2 - 2
toolset/setup/linux/frameworks/siena.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists play-1.2.5/modules/siena-2.0.6
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists play-1.2.5/modules/siena-2.0.6)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_depends play1
 yes | play-1.2.5/play1 install siena

+ 3 - 5
toolset/setup/linux/frameworks/treefrog.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
 
-fw_exists /usr/bin/treefrog
-ret1=$?
-fw_exists /usr/bin/tspawn
-ret2=$?
-if [ $ret1 -eq 0 ] && [ $ret2 -eq 0 ]; then 
+RET1=$(fw_exists /usr/bin/treefrog)
+RET2=$(fw_exists /usr/bin/tspawn)
+if [ "$RET1" == 0 ] && [ "$RET2" == 0 ]; then 
   return 0;
 fi
 

+ 2 - 2
toolset/setup/linux/frameworks/vertx.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists vert.x-2.1.1
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists vert.x-2.1.1)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://dl.bintray.com/vertx/downloads/vert.x-2.1.1.tar.gz?direct=true -O vert.x-2.1.1.tar.gz
 fw_untar vert.x-2.1.1.tar.gz

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

@@ -1,19 +1,19 @@
 #!/bin/bash
 
-fw_exists wt
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists wt)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 # TODO can this be changed based on the OS we are using? This is not
 # available on 12.04 (libboost-all-dev is available, but requires some
 # apt-get cleaning before it can be installed)
-sudo apt-get install libboost1.54-all-dev
+sudo apt-get -y install libboost1.54-all-dev
 
 fw_get http://downloads.sourceforge.net/witty/wt-3.3.3.tar.gz -O wt.tar.gz
 fw_untar wt.tar.gz
 
 mv wt-* wt
 cd wt
-mkdir build
+mkdir -p build
 cd build
 cmake .. -DWT_CPP_11_MODE=-std=c++0x -DCMAKE_BUILD_TYPE=Release
 make

+ 2 - 0
toolset/setup/linux/frameworks/yesod.sh

@@ -1,4 +1,6 @@
 #!/bin/bash
 
+fw_depends haskell
+
 cabal update
 cabal install yesod persistent-mysql

+ 3 - 2
toolset/setup/linux/languages/composer.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
-fw_exists bin/composer.phar
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists bin/composer.phar)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_depends php
 fw_get https://getcomposer.org/installer -O composer-installer.php
+mkdir -p bin
 php composer-installer.php --install-dir=bin

+ 2 - 2
toolset/setup/linux/languages/dart.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists dart-sdk
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists dart-sdk)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://storage.googleapis.com/dart-archive/channels/stable/release/latest/sdk/dartsdk-linux-x64-release.zip
 fw_unzip dartsdk-linux-x64-release.zip

+ 1 - 0
toolset/setup/linux/languages/elixir.sh

@@ -2,6 +2,7 @@
 
 # TODO seems to be broken installation
 echo "WARN: Elixir does not install"
+return 1
 
 # fw_exists v0.13.3.tar.gz
 # [ $? -ne 0 ] || { return 0; }

+ 2 - 3
toolset/setup/linux/languages/erlang.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
 
-fw_exists /usr/bin/erl
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/bin/erl)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 sudo cp ../config/erlang.list /etc/apt/sources.list.d/erlang.list
 
 fw_get http://binaries.erlang-solutions.com/debian/erlang_solutions.asc
-fw_untar node-v0.10.8-linux-x64.tar.gz
 
 sudo apt-key add erlang_solutions.asc
 sudo apt-get -y update

+ 2 - 3
toolset/setup/linux/languages/haskell.sh

@@ -1,7 +1,6 @@
 #!/bin/bash
 
-# TODO check this path...
-fw_exists /usr/bin/haskell-compiler
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/bin/haskell-compiler)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 sudo apt-get install -y ghc cabal-install

+ 2 - 2
toolset/setup/linux/languages/hhvm.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists /usr/bin/hhvm
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/bin/hhvm)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 sudo add-apt-repository -y ppa:mapnik/v2.2.0
 wget -O - http://dl.hhvm.com/conf/hhvm.gpg.key | sudo apt-key add -

+ 2 - 2
toolset/setup/linux/languages/jruby.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists ~/.rvm/rubies/jruby-1.7.8/
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists ~/.rvm/rubies/jruby-1.7.8/)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 # Instead of installing separately, we install JRuby 
 # whenever we install Ruby

+ 4 - 4
toolset/setup/linux/languages/mono.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
-fw_exists mono-3.2.8
-[ $? -ne 0 ] || { \
+
+RETCODE=$(fw_exists mono-3.2.8)
+[ ! "$RETCODE" == 0 ] || { \
   echo "Installing RootCAs from Mozilla..."; 
   mozroots --import --sync;
   return 0; }
@@ -14,6 +15,5 @@ make get-monolite-latest
 make -j4 EXTERNAL_MCS=${PWD}/mcs/class/lib/monolite/basic.exe
 sudo make install
 
-mv mono-3.2.8 mono
-
+echo "Installing RootCAs from Mozilla..."; 
 mozroots --import --sync;

+ 4 - 4
toolset/setup/linux/languages/nimrod.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists nimrod/bin/nimrod
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists nimrod/bin/nimrod)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 test -d nimrod || git clone git://github.com/Araq/Nimrod.git nimrod
 cd nimrod 
@@ -14,8 +14,8 @@ chmod +x build.sh
 ./build.sh
 
 cd ../..
-fw_exists nimrod/koch
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists nimrod/koch)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 cd nimrod
 bin/nimrod c koch

+ 2 - 2
toolset/setup/linux/languages/nodejs.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists node-v0.10.8-linux-x64
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists node-v0.10.8-linux-x64)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://nodejs.org/dist/v0.10.8/node-v0.10.8-linux-x64.tar.gz
 fw_untar node-v0.10.8-linux-x64.tar.gz

+ 2 - 2
toolset/setup/linux/languages/perl.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists perl-5.18
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists perl-5.18)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get https://raw.githubusercontent.com/tokuhirom/Perl-Build/master/perl-build -O perl-build.pl
 perl perl-build.pl -DDEBUGGING=-g 5.18.2 perl-5.18

+ 3 - 2
toolset/setup/linux/languages/phalcon.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
 
+RETCODE=$(fw_exists /usr/local/lib/php/extensions/no-debug-non-zts-20100525/phalcon.so)
+[ ! "$RETCODE" == 0 ] || { return 0; }
+
 fw_depends php
-fw_exists /usr/local/lib/php/extensions/no-debug-non-zts-20100525/phalcon.so
-[ $? -ne 0 ] || { return 0; }
 
 test -d cphalcon || git clone git://github.com/phalcon/cphalcon.git
 cd cphalcon/build && sudo ./install

+ 8 - 8
toolset/setup/linux/languages/php.sh

@@ -4,8 +4,8 @@
 # Two path checks would both always run in php. In this code the check 
 # for apc.so only happens if the check for php fails. Is that ok? 
 
-fw_exists /usr/local/bin/php
-[ $? -ne 0 ] || { \
+RETCODE=$(fw_exists /usr/local/bin/php)
+[ ! "$RETCODE" == 0 ] || { \
   echo "Moving PHP config files into place"; 
   sudo cp ../config/php.ini /usr/local/lib/php.ini
   sudo cp ../config/php-fpm.conf /usr/local/lib/php-fpm.conf
@@ -18,12 +18,12 @@ cd php-5.4.13
 make
 sudo make install
 
+sudo cp ../config/php.ini /usr/local/lib/php.ini
+sudo cp ../config/php-fpm.conf /usr/local/lib/php-fpm.conf
+
 cd ..
-fw_exists /usr/local/lib/php/extensions/no-debug-non-zts-20100525/apc.so
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/local/lib/php/extensions/no-debug-non-zts-20100525/apc.so)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 cd php-5.4.13
-printf "\n" | sudo pecl install apc-beta
-
-sudo cp ../config/php.ini /usr/local/lib/php.ini
-sudo cp ../config/php-fpm.conf /usr/local/lib/php-fpm.conf
+printf "\n" | sudo pecl install apc-beta

+ 2 - 2
toolset/setup/linux/languages/pypy.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists pypy
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists pypy)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get https://bitbucket.org/pypy/pypy/downloads/pypy-2.3.1-linux64.tar.bz2 -O pypy-2.3.1-linux64.tar.bz2
 tar vxf pypy-2.3.1-linux64.tar.bz2

+ 4 - 4
toolset/setup/linux/languages/python2.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-fw_exists py2
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists py2)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
-# fw_get http://www.python.org/ftp/python/2.7.7/Python-2.7.7.tgz
-# tar vxf Python-2.7.7.tgz
+fw_get http://www.python.org/ftp/python/2.7.7/Python-2.7.7.tgz
+tar vxf Python-2.7.7.tgz
 pre=$(pwd)
 cd Python-2.7.7
 ./configure --prefix=${pre}/py2 --disable-shared

+ 2 - 2
toolset/setup/linux/languages/python3.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists py3
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists py3)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://www.python.org/ftp/python/3.4.1/Python-3.4.1.tar.xz
 tar vxf Python-3.4.1.tar.xz

+ 3 - 5
toolset/setup/linux/languages/racket.sh

@@ -1,10 +1,8 @@
 #!/bin/bash
 
-fw_exists racket-5.3.6/bin/racket
-ret1=$?
-fw_exists racket-5.3.6/collects/racket
-ret2=$?
-if [ $ret1 -eq 0 ] && [$ret2 -eq 0 ]; then 
+RET1=$(fw_exists racket-5.3.6/bin/racket)
+RET2=$(fw_exists racket-5.3.6/collects/racket)
+if [ "$RET1" == 0 ] && [ "$RET2" == 0 ]; then 
   return 0;
 fi
 

+ 2 - 2
toolset/setup/linux/languages/ringojs.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists /usr/share/ringojs
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/share/ringojs)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://www.ringojs.org/downloads/ringojs_0.10-1_all.deb
 sudo apt-get install -y jsvc

+ 16 - 2
toolset/setup/linux/languages/ruby.sh

@@ -1,16 +1,30 @@
 #!/bin/bash
 
+# TODO Install RVM inside installs directory. Perhaps use rvm-path
+
 curl -L get.rvm.io | bash -s head --auto-dotfiles
 echo rvm_auto_reload_flag=2 >> ~/.rvmrc
 
-fw_exists ~/.rvm/rubies/ruby-2.0.0-p0/
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists ~/.rvm/rubies/ruby-2.0.0-p0/)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 . ~/.rvm/scripts/rvm
 . ~/.profile
+
+# Disable trap and errtrace, as a 'normal' ruby 
+# install internally has errors, which cause our 
+# installer system to report a potential ruby install 
+# failure
+set +E
+trap '' ERR
+
 rvm install 2.0.0-p0
 rvm 2.0.0-p0 do gem install bundler
 
 # Install JRuby 
 rvm install jruby-1.7.8
 rvm jruby-1.7.8 do gem install bundler
+
+# Turn errtrace back on (the ERR trap will 
+# be restored by fw_depends)
+set -E

+ 2 - 2
toolset/setup/linux/languages/urweb.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists /usr/local/bin/urweb
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/local/bin/urweb)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 hg clone http://hg.impredicative.com/urweb
 cd urweb

+ 2 - 2
toolset/setup/linux/languages/xsp.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists xsp
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists xsp)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_depends mono
 git clone --depth 1 git://github.com/mono/xsp

+ 2 - 2
toolset/setup/linux/languages/yaf.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists /usr/local/lib/php/extensions/no-debug-non-zts-20100525/yaf.so
-[ $? -ne 0 ] || { \
+RETCODE=$(fw_exists /usr/local/lib/php/extensions/no-debug-non-zts-20100525/yaf.so)
+[ ! "$RETCODE" == 0 ] || { \
   echo "Enabling yaf in PHP configuration...";
   sudo cp ../config/php.ini /usr/local/lib/php.ini
   sudo cp ../config/php-fpm.conf /usr/local/lib/php-fpm.conf

+ 2 - 2
toolset/setup/linux/systools/leiningen.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists bin/lein
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists bin/lein)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 mkdir -p bin
 fw_get https://raw.github.com/technomancy/leiningen/stable/bin/lein

+ 2 - 2
toolset/setup/linux/systools/maven.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists /usr/bin/mvn
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/bin/mvn)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 sudo apt-get -y install maven -qq
 mvn -version

+ 2 - 2
toolset/setup/linux/webservers/lapis.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists /usr/local/bin/lapis
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/local/bin/lapis)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 sudo apt-get install -y luarocks
 sudo luarocks install http://github.com/leafo/lapis/raw/master/lapis-dev-1.rockspec

+ 2 - 2
toolset/setup/linux/webservers/mongrel2.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists /usr/local/bin/mongrel2
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/local/bin/mongrel2)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_depends zeromq
 

+ 2 - 2
toolset/setup/linux/webservers/nginx.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists /usr/local/nginx/sbin/nginx
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/local/nginx/sbin/nginx)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://nginx.org/download/nginx-1.4.1.tar.gz
 fw_untar nginx-1.4.1.tar.gz

+ 2 - 2
toolset/setup/linux/webservers/openresty.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists /usr/local/openresty/nginx/sbin/nginx
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/local/openresty/nginx/sbin/nginx)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_depends nginx
 fw_get http://openresty.org/download/ngx_openresty-1.5.8.1.tar.gz

+ 2 - 2
toolset/setup/linux/webservers/resin.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists resin-4.0.36/conf/resin.xml
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists resin-4.0.36/conf/resin.xml)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_depends java
 sudo cp -r /usr/lib/jvm/java-1.7.0-openjdk-amd64/include /usr/lib/jvm/java-1.7.0-openjdk-amd64/jre/bin/

+ 1 - 0
toolset/setup/linux/webservers/weber.sh

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 echo "WARN: Weber is not working"
+return 1
 #fw_exists weber
 #[ $? -ne 0 ] || { return 0; }
 

+ 2 - 2
toolset/setup/linux/webservers/zeromq.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-fw_exists /usr/local/lib/libzmq.a
-[ $? -ne 0 ] || { return 0; }
+RETCODE=$(fw_exists /usr/local/lib/libzmq.a)
+[ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://download.zeromq.org/zeromq-4.0.3.tar.gz
 fw_untar zeromq-4.0.3.tar.gz