1
0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2024-12-27 06:15:25 +00:00

Fix casing on notices

This commit is contained in:
Jose Diaz-Gonzalez 2016-09-20 01:06:26 -06:00
parent 1b0c929144
commit 8348cbde99

View File

@ -21,7 +21,7 @@ CUR_DIR=$(cd "$(dirname "$0")"; cd ..; pwd)
mkdir -p "$BUILD_DIR" "$CACHE_DIR" mkdir -p "$BUILD_DIR" "$CACHE_DIR"
if [[ ! -e "${BUILD_DIR}/www" ]]; then if [[ ! -e "${BUILD_DIR}/www" ]]; then
echo "-----> copy static files to www" echo "-----> Copy static files to www"
rm -rf "${CACHE_DIR}/www" rm -rf "${CACHE_DIR}/www"
mkdir -p "${CACHE_DIR}/www" mkdir -p "${CACHE_DIR}/www"
@ -44,25 +44,25 @@ fi
cd "$CACHE_DIR" cd "$CACHE_DIR"
if [[ ! -d "${NGINX_TARBALL%.tar.gz}" ]]; then if [[ ! -d "${NGINX_TARBALL%.tar.gz}" ]]; then
echo "-----> download and unzip nginx" echo "-----> Download and unzip nginx"
curl -sSL "http://nginx.org/download/${NGINX_TARBALL}" -o "${NGINX_TARBALL}" curl -sSL "http://nginx.org/download/${NGINX_TARBALL}" -o "${NGINX_TARBALL}"
tar xzf "${NGINX_TARBALL}" && rm -f "${NGINX_TARBALL}" tar xzf "${NGINX_TARBALL}" && rm -f "${NGINX_TARBALL}"
fi fi
if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then if [[ ! -d "${PCRE_TARBALL%.tar.gz}" ]]; then
echo "-----> download and unzip pcre" echo "-----> Download and unzip pcre"
curl -sSL "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${PCRE_TARBALL}" -o "${PCRE_TARBALL}" curl -sSL "http://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${PCRE_TARBALL}" -o "${PCRE_TARBALL}"
tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}" tar xzf "${PCRE_TARBALL}" && rm -f "${PCRE_TARBALL}"
fi fi
if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then if [[ ! -d "${ZLIB_TARBALL%.tar.gz}" ]]; then
echo "-----> download and unzip zlib" echo "-----> Download and unzip zlib"
curl -sSL "http://zlib.net/${ZLIB_TARBALL}" -o "${ZLIB_TARBALL}" curl -sSL "http://zlib.net/${ZLIB_TARBALL}" -o "${ZLIB_TARBALL}"
tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}" tar xzf "${ZLIB_TARBALL}" && rm -rf "${ZLIB_TARBALL}"
fi fi
if [[ ! -f "sigil" ]]; then if [[ ! -f "sigil" ]]; then
echo "-----> download and unzip sigil" echo "-----> Download and unzip sigil"
curl -sSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/${SIGIL_TARBALL}" -o "${SIGIL_TARBALL}" curl -sSL "https://github.com/gliderlabs/sigil/releases/download/v${SIGIL_VERSION}/${SIGIL_TARBALL}" -o "${SIGIL_TARBALL}"
tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}" tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}"
fi fi
@ -72,7 +72,7 @@ cp -r sigil "$BUILD_DIR/sigil/"
cd "nginx-${NGINX_VERSION}" cd "nginx-${NGINX_VERSION}"
if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
echo "-----> compile static nginx" echo "-----> Compiling static nginx binary"
mkdir "$BUILD_DIR/nginx" mkdir "$BUILD_DIR/nginx"
./configure \ ./configure \
--with-cpu-opt=generic \ --with-cpu-opt=generic \
@ -121,7 +121,7 @@ if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
cp -r $BUILD_DIR/nginx/* "$CACHE_DIR/bin/" cp -r $BUILD_DIR/nginx/* "$CACHE_DIR/bin/"
else else
echo "-----> reuse nginx from cache" echo "-----> Reusing nginx binary from cache"
mkdir -p "$BUILD_DIR/nginx" mkdir -p "$BUILD_DIR/nginx"
# shellcheck disable=SC2086 # shellcheck disable=SC2086
cp -r $CACHE_DIR/bin/* "$BUILD_DIR/nginx/" cp -r $CACHE_DIR/bin/* "$BUILD_DIR/nginx/"
@ -137,7 +137,7 @@ cd "$CUR_DIR"
# Add support for app-nginx.conf.sigil # Add support for app-nginx.conf.sigil
if [ -f "$BUILD_DIR/app-nginx.conf.sigil" ] ; then if [ -f "$BUILD_DIR/app-nginx.conf.sigil" ] ; then
echo "-----> using user provided app-nginx.conf.sigil" echo "-----> Using user provided app-nginx.conf.sigil"
cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/nginx.conf.sigil" cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/nginx.conf.sigil"
fi fi
@ -148,17 +148,17 @@ if [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then
# ...else, force default file # ...else, force default file
else else
echo "-----> using default nginx.conf.sigil" echo "-----> Using default nginx.conf.sigil"
cp conf/nginx.conf.sigil "$BUILD_DIR/nginx/nginx.conf.sigil" cp conf/nginx.conf.sigil "$BUILD_DIR/nginx/nginx.conf.sigil"
fi fi
# build mime.types unless overridden by user # build mime.types unless overridden by user
if [ -f "$BUILD_DIR/mime.types" ] ; then if [ -f "$BUILD_DIR/mime.types" ] ; then
echo "-----> using user provided mime.types" echo "-----> Using user provided mime.types"
cp "$BUILD_DIR/mime.types" "$BUILD_DIR/nginx/mime.types" cp "$BUILD_DIR/mime.types" "$BUILD_DIR/nginx/mime.types"
else else
echo "-----> using default mime.types" echo "-----> Using default mime.types"
cp conf/mime.types "$BUILD_DIR/nginx/mime.types" cp conf/mime.types "$BUILD_DIR/nginx/mime.types"
fi fi