Merge pull request #879 from daef/master

compose/Makefile

@@ -1,4 +1,4 @@
-SHELL := /bin/bash
+SHELL := /usr/bin/env bash
 
 args = `arg="$(filter-out $(firstword $(MAKECMDGOALS)),$(MAKECMDGOALS))" && echo $${arg:-${1}}`
 
@@ -64,7 +64,7 @@ help:
 	@echo "$(call format,xdebug,'Disable or enable Xdebug.')"
 
 bash:
-	@./bin/bash
+	@./usr/bin/env bash
 
 cache-clean:
 	@./bin/cache-clean $(call args)

compose/bin/analyse

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/cli vendor/bin/phpstan analyse "$@"

compose/bin/bash

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/cli bash

compose/bin/cache-clean

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 COMPOSER_GLOBAL=/var/www/.composer-global
 CACHE_CLEAN=${COMPOSER_GLOBAL}/vendor/bin/cache-clean.js
 

compose/bin/cli

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 [ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
 bin/docker-compose exec phpfpm "$@"

compose/bin/clinotty

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 [ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
 # -T: Disable pseudo-tty allocation
 bin/docker-compose exec -T phpfpm "$@"

compose/bin/cliq

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 [ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
 # Without stdout and stderr
 bin/clinotty "$@" >/dev/null 2>&1

compose/bin/composer

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/cli composer "$@"

compose/bin/copyfromcontainer

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 [ -z "$1" ] && echo "Please specify a directory or file to copy from container (ex. vendor, --all)" && exit
 
 REAL_SRC=$(cd -P "src" && pwd)

compose/bin/copytocontainer

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 [ -z "$1" ] && echo "Please specify a directory or file to copy to container (ex. vendor, --all)" && exit
 
 REAL_SRC=$(cd -P "src" && pwd)

compose/bin/cron

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 [ -z "$1" ] && echo "Please specify a service operation (start|stop|status|restart|reload|force-reload)" && exit
 bin/root service cron "$@"
 bin/root touch /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status

compose/bin/dev-test-run

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 [ -z "$1" ] && echo "Please specify test type (ex. integration)" && exit
 

compose/bin/dev-urn-catalog-generate

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/magento dev:urn-catalog:generate misc.xml
 bin/copyfromcontainer misc.xml
 mkdir -p src/.idea

compose/bin/devconsole

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/n98-magerun2 dev:console

compose/bin/docker-compose

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 if docker compose version > /dev/null 2>&1; then
   DOCKER_COMPOSE="docker compose"

compose/bin/download

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 VERSION=${1:-2.4.5-p1}
 EDITION=${2:-community}

compose/bin/fixowns

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo "Fixing filesystem ownerships..."
 
 if [ -z "$1" ]; then

compose/bin/fixperms

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo "Fixing filesystem permissions..."
 
 if [ -z "$1" ]; then

compose/bin/grunt

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/cli npx grunt "$@"

compose/bin/install-php-extensions

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 if ! bin/cliq ls /usr/local/bin/install-php-extensions; then
   echo "Downloading install-php-extensions, just a moment..."
   bin/rootnotty curl -sSLf \

compose/bin/magento

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/cli bin/magento "$@"

compose/bin/mftf

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/clinotty vendor/bin/mftf "$@"

compose/bin/mysql

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # shellcheck source=../env/db.env
 source env/db.env

compose/bin/mysqldump

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/n98-magerun2 db:dump --stdout "$@"

compose/bin/n98-magerun2

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 if ! bin/cliq ls bin/n98-magerun2.phar; then
   echo "Downloading n98-magerun2.phar, just a moment..."
   bin/clinotty curl -sS -O https://files.magerun.net/n98-magerun2.phar

compose/bin/node

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/cli node "$@"

compose/bin/npm

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/cli npm "$@"

compose/bin/phpcbf

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/clinotty vendor/bin/phpcbf --standard=Magento2 --extensions=php,phtml --error-severity=10 --ignore-annotations "$@"

compose/bin/phpcs

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/clinotty vendor/bin/phpcs --standard=Magento2 --extensions=php,phtml --error-severity=10 --ignore-annotations "$@"

compose/bin/phpcs-json-report

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/clinotty vendor/bin/phpcs --standard=Magento2 --extensions=php,phtml --error-severity=10 --ignore-annotations --report=json "$@" > report.json

compose/bin/pwa-studio

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -o errexit
 
 if [ ! -d pwa-studio ]; then

compose/bin/redis

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/docker-compose exec redis "$@"

compose/bin/remove

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/docker-compose rm

compose/bin/removeall

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/stopall
 bin/remove
 bin/removevolumes

compose/bin/removevolumes

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 current_folder=${PWD##*/}
 volume_prefix=$(echo "$current_folder" | awk '{print tolower($0)}' | sed 's/\.//g')
 docker volume rm "${volume_prefix}"_appdata

compose/bin/restart

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/stop "$@"
 bin/start "$@"

compose/bin/root

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 [ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
 bin/docker-compose exec -u root phpfpm "$@"

compose/bin/rootnotty

@@ -1,3 +1,3 @@
-#!/bin/bash
+#!/usr/bin/env bash
 [ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
 bin/docker-compose exec -u root -T phpfpm "$@"

compose/bin/setup

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -o errexit
 
 MEM_BYTES=$(docker info -f '{{.MemTotal}}')

compose/bin/setup-composer-auth

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 MAGENTO_USERNAME_PROP="http-basic.repo.magento.com.username"
 MAGENTO_PASSWORD_PROP="http-basic.repo.magento.com.password"
 hash composer 2>/dev/null && IS_COMPOSER_ON_HOST=true

compose/bin/setup-domain

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -o errexit
 
 [ -z "$1" ] && echo "Please specify a domain name (ex. magento.test)" && exit

compose/bin/setup-grunt

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 echo "Confirming n98-magerun2 is installed..."
 bin/n98-magerun2 > /dev/null 2>&1
 

compose/bin/setup-integration-tests

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # shellcheck source=../env/db.env
 source env/db.env

compose/bin/setup-pwa-studio

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -o errexit
 echo "Install NodeJS and Yarn on host machine, otherwise setup will fail"
 

compose/bin/setup-ssl

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 [ -z "$1" ] && echo "Please specify a domain (ex. mydomain.test)" && exit
 
 # Generate certificate authority if not already setup

compose/bin/setup-ssl-ca

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -o errexit
 # Generate a new local CA "/root/.local/share/mkcert"
 bin/docker-compose exec -T -u root app mkcert -install

compose/bin/start

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -o errexit
 
 MEM=$(docker info | grep "Total Memory" | cut -d':' -f2 | xargs | sed s/GiB//)

compose/bin/status

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/docker-compose ps

compose/bin/stop

@@ -1,2 +1,2 @@
-#!/bin/bash
+#!/usr/bin/env bash
 bin/docker-compose stop "$@"

compose/bin/stopall

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 if [ -z "$(docker ps -q)" ]; then
     echo "You have no running container"
 else

compose/bin/update

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -o errexit
 mkdir -p tmpupdate && cd "$_"
 curl -s https://raw.githubusercontent.com/markshust/docker-magento/master/lib/template | bash

compose/bin/xdebug

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 S=$(bin/clinotty cat /usr/local/etc/php/php.ini | grep -iGc 'xdebug.mode = off');
 

lib/onelinesetup

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -o errexit
 
 DOMAIN=${1:-magento.test}

lib/template

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 git init -qqq
 git remote add origin https://github.com/markshust/docker-magento
 git fetch origin -qqq