kawaiipunk/buildpack-nginx
1
0
Fork 0
mirror of https://github.com/dokku/buildpack-nginx.git synced 2024-11-25 02:23:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #55 from dokku/cleanup

Browse Source 
chore: run shfmt
This commit is contained in:
Jose Diaz-Gonzalez 2022-09-10 17:16:24 -04:00 committed by GitHub
commit 7a1b16877d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/compile
View File

@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# bin/compile <build-dir> <cache-dir> # bin/compile <build-dir> <cache-dir>
set -eo pipefail; [[ $TRACE ]] && set -x set -eo pipefail
[[ $TRACE ]] && set -x
NGINX_VERSION="1.17.0" NGINX_VERSION="1.17.0"
NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz" NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
@ -12,14 +13,16 @@ ZLIB_VERSION="1.2.11"
ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz" ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"
suppress() { suppress() {
/bin/rm --force /tmp/surpress.out 2>/dev/null
# shellcheck disable=SC2069 # shellcheck disable=SC2069
/bin/rm --force /tmp/surpress.out 2> /dev/null; "$@" 2>&1 > /tmp/surpress.out || cat /tmp/surpress.out; /bin/rm /tmp/surpress.out; "$@" 2>&1 >/tmp/surpress.out || cat /tmp/surpress.out
/bin/rm /tmp/surpress.out
} }
# 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"
@ -130,19 +133,19 @@ 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/app-nginx.conf.sigil" cp "$BUILD_DIR/app-nginx.conf.sigil" "$BUILD_DIR/nginx/app-nginx.conf.sigil"
# Allow deprecated nginx.conf.erb # Allow deprecated nginx.conf.erb
elif [ -f "$BUILD_DIR/nginx.conf.erb" ] ; then elif [ -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"
@ -153,7 +156,7 @@ else
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"

3
bin/detect
View File

@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# bin/detect <build-dir> <cache-dir> # bin/detect <build-dir> <cache-dir>
set -eo pipefail; [[ $TRACE ]] && set -x set -eo pipefail
[[ $TRACE ]] && set -x
# Exit early if app is clearly not an nginx app # Exit early if app is clearly not an nginx app
if [[ ! -f "$1/.static" ]]; then if [[ ! -f "$1/.static" ]]; then

3
bin/release
View File

@ -1,6 +1,7 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# bin/release <build-dir> # bin/release <build-dir>
set -eo pipefail; [[ $TRACE ]] && set -x set -eo pipefail
[[ $TRACE ]] && set -x
cat <<EOF cat <<EOF
--- ---