Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Force nginx to be installed per build

  • Loading branch information...
commit 64430d76381bb9574fdc2326c0c0e2cddd3bdfdc 1 parent 16f08cb
Jacob Burch authored
Showing with 3 additions and 4 deletions.
  1. +3 −4 bin/compile
7 bin/compile
View
@@ -22,7 +22,6 @@ PCRE_VERSION='pcre-8.35'
source $BIN_DIR/utils
mkdir -p $BUILD_DIR/local
-cp $BIN_DIR/launch-nginx "$BUILD_DIR/local/sbin"
if [[ ! -d "$CACHE_DIR/$PYTHON_VERSION" ]]; then
cd $CACHE_DIR
puts-step "Installing Python ($PYTHON_VERSION)"
@@ -81,7 +80,7 @@ if [[ ! -d "$CACHE_DIR/$PCRE_VERSION" ]]; then
fi
puts-step "Installing nginx ($NGINX_VERSION)"
-if [[ ! -d "$CACHE_DIR/$NGINX_VERSION" ]]; then
+# if [[ ! -d "$CACHE_DIR/$NGINX_VERSION" ]]; then
cd $CACHE_DIR
curl http://nginx.org/download/$NGINX_VERSION.tar.gz -s | tar xz &> /dev/null
cd $NGINX_VERSION
@@ -93,7 +92,7 @@ if [[ ! -d "$CACHE_DIR/$NGINX_VERSION" ]]; then
--without-http_proxy_module \
--with-http_gzip_static_module &> /dev/null
make -j2 &> /dev/null
-fi
+# fi
cd $CACHE_DIR/$NGINX_VERSION
make install &> /dev/null
@@ -106,5 +105,5 @@ if [[ ! -f $BUILD_DIR/nginx.conf.erb ]]; then
fi
cp $ROOT_DIR/conf/mime.types $BUILD_DIR/
-# cp $BIN_DIR/launch-nginx "$BUILD_DIR/local/sbin"
+cp $BIN_DIR/launch-nginx "$BUILD_DIR/local/sbin"
Please sign in to comment.
Something went wrong with that request. Please try again.