kawaiipunk/buildpack-nginx
1
0
Fork 0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2024-09-20 19:36:03 +00:00
Code Issues Releases Wiki Activity

Run shellcheck against repository

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez 2016-09-20 01:00:40 -06:00
parent aa23156a8e
commit ed2e482ed9
2 changed files with 61 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Makefile Normal file
View File

@ -0,0 +1,20 @@
shellcheck:
ifeq ($(shell shellcheck > /dev/null 2>&1 ; echo $$?),127)
ifeq ($(shell uname),Darwin)
brew install shellcheck
else
sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse'
sudo apt-get update -qq && sudo apt-get install -qq -y shellcheck
endif
endif
ci-dependencies: shellcheck
lint:
@echo linting...
@$(QUIET) find ./ -maxdepth 2 -not -path '*/\.*' | xargs file | egrep "shell|bash" | awk '{ print $$1 }' | sed 's/://g' | xargs shellcheck
setup:
$(MAKE) ci-dependencies
test: setup lint

76
bin/compile
View File

@ -16,28 +16,32 @@ ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
# parse and derive params # parse and derive params
BUILD_DIR=$1 BUILD_DIR=$1
CACHE_DIR=$2 CACHE_DIR=$2
CUR_DIR=`cd $(dirname $0); cd ..; pwd` 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"
mv $BUILD_DIR/* $CACHE_DIR/www
mkdir -p $BUILD_DIR/www # shellcheck disable=SC2086
mv $CACHE_DIR/www/* $BUILD_DIR/www mv $BUILD_DIR/* "${CACHE_DIR}/www"
mkdir -p "${BUILD_DIR}/www"
# shellcheck disable=SC2086
mv ${CACHE_DIR}/www/* "${BUILD_DIR}/www"
# Check for a copy the nginx conf file override to the build dir # Check for a copy the nginx conf file override to the build dir
[[ -f "$BUILD_DIR/www/nginx.conf.erb" ]] && mv $BUILD_DIR/www/nginx.conf.erb $BUILD_DIR [[ -f "${BUILD_DIR}/www/nginx.conf.erb" ]] && mv "${BUILD_DIR}/www/nginx.conf.erb" "${BUILD_DIR}"
[[ -f "$BUILD_DIR/www/nginx.conf.sigil" ]] && mv $BUILD_DIR/www/nginx.conf.sigil $BUILD_DIR [[ -f "${BUILD_DIR}/www/nginx.conf.sigil" ]] && mv "${BUILD_DIR}/www/nginx.conf.sigil" "${BUILD_DIR}"
[[ -f "$BUILD_DIR/www/app-nginx.conf.sigil" ]] && mv $BUILD_DIR/www/app-nginx.conf.sigil $BUILD_DIR [[ -f "${BUILD_DIR}/www/app-nginx.conf.sigil" ]] && mv "${BUILD_DIR}/www/app-nginx.conf.sigil" "${BUILD_DIR}"
[[ -f "$BUILD_DIR/www/mime.types" ]] && mv $BUILD_DIR/www/mime.types $BUILD_DIR [[ -f "${BUILD_DIR}/www/mime.types" ]] && mv "${BUILD_DIR}/www/mime.types" "${BUILD_DIR}"
[[ -f "$BUILD_DIR/www/CHECKS" ]] && mv $BUILD_DIR/www/CHECKS $BUILD_DIR [[ -f "${BUILD_DIR}/www/CHECKS" ]] && mv "${BUILD_DIR}/www/CHECKS" "${BUILD_DIR}"
[[ -f "$BUILD_DIR/www/app.json" ]] && mv $BUILD_DIR/www/app.json $BUILD_DIR [[ -f "${BUILD_DIR}/www/app.json" ]] && mv "${BUILD_DIR}/www/app.json" "${BUILD_DIR}"
rm -rf $CACHE_DIR/www rm -rf "${CACHE_DIR}/www"
fi 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"
@ -63,16 +67,16 @@ if [[ ! -f "sigil" ]]; then
tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}" tar xzf "${SIGIL_TARBALL}" && rm -rf "${SIGIL_TARBALL}"
fi fi
mkdir -p $BUILD_DIR/sigil mkdir -p "$BUILD_DIR/sigil"
cp -r sigil $BUILD_DIR/sigil/ 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 "-----> compile static nginx"
mkdir $BUILD_DIR/nginx mkdir "$BUILD_DIR/nginx"
./configure \ ./configure \
--with-cpu-opt=generic \ --with-cpu-opt=generic \
--prefix=$BUILD_DIR/nginx \ --prefix="$BUILD_DIR/nginx" \
--with-pcre=../pcre-${PCRE_VERSION} \ --with-pcre=../pcre-${PCRE_VERSION} \
--sbin-path=. \ --sbin-path=. \
--pid-path=./nginx.pid \ --pid-path=./nginx.pid \
@ -112,48 +116,50 @@ if [[ ! -f "${CACHE_DIR}/bin/nginx" ]]; then
make && make install make && make install
rm -rf $CACHE_DIR/bin && mkdir -p $CACHE_DIR/bin/ rm -rf "${CACHE_DIR:?}/bin" && mkdir -p "$CACHE_DIR/bin/"
cp -r $BUILD_DIR/nginx/* $CACHE_DIR/bin/ # shellcheck disable=SC2086
cp -r $BUILD_DIR/nginx/* "$CACHE_DIR/bin/"
else else
echo "-----> reuse nginx from cache" echo "-----> reuse nginx from cache"
mkdir -p $BUILD_DIR/nginx mkdir -p "$BUILD_DIR/nginx"
cp -r $CACHE_DIR/bin/* $BUILD_DIR/nginx/ # shellcheck disable=SC2086
cp -r $CACHE_DIR/bin/* "$BUILD_DIR/nginx/"
fi fi
# Update the PATH # Update the PATH
mkdir -p $BUILD_DIR/.profile.d mkdir -p "$BUILD_DIR/.profile.d"
cat > $BUILD_DIR/.profile.d/nginx.sh <<"EOF" cat > "$BUILD_DIR/.profile.d/nginx.sh" <<"EOF"
export PATH="$PATH:$HOME/nginx" export PATH="$PATH:$HOME/nginx"
EOF EOF
cd $CUR_DIR 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
# Allow deprecated nginx.conf.erb # Allow deprecated nginx.conf.erb
if [ -f $BUILD_DIR/nginx.conf.erb ] ; then if [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then
echo "-----> DEPRECATED: using user provided nginx.conf.erb" echo "-----> DEPRECATED: using user provided nginx.conf.erb"
cp $BUILD_DIR/nginx.conf.erb $BUILD_DIR/nginx/nginx.conf.erb cp "$BUILD_DIR/nginx.conf.erb" "$BUILD_DIR/nginx/nginx.conf.erb"
# ...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
# build a startup script # build a startup script