Update versions bin and env from upstream

Author: fmarczewski

bin/cache-clean

@@ -0,0 +1,2 @@
+#!/bin/bash
+bin/cli /var/www/.composer-global/vendor/bin/cache-clean.js "$@"

bin/cliq

@@ -0,0 +1,3 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a CLI command (ex. ls)" && exit
+bin/clinotty "$@" >/dev/null

bin/copyfromcontainer

@@ -0,0 +1,15 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a directory or file to copy from container (ex. vendor, --all)" && exit
+
+REAL_SRC=$(cd -P "src" && pwd)
+if [ "$1" == "--all" ]; then
+  docker cp "$(docker-compose ps -q phpfpm|awk '{print $1}')":/var/www/html/./ "$REAL_SRC/"
+  echo "Completed copying all files from container to host"
+else
+  if [ -f "$1" ] ; then
+    docker cp "$(docker-compose ps -q phpfpm|awk '{print $1}')":/var/www/html/"$1" "$REAL_SRC/$1"
+  else
+    docker cp "$(docker-compose ps -q phpfpm|awk '{print $1}')":/var/www/html/"$1" "$REAL_SRC/$(dirname "$1")"
+  fi
+  echo "Completed copying $1 from container to host"
+fi

bin/copytocontainer

@@ -0,0 +1,19 @@
+#!/bin/bash
+[ -z "$1" ] && echo "Please specify a directory or file to copy to container (ex. vendor, --all)" && exit
+
+REAL_SRC=$(cd -P "src" && pwd)
+if [ "$1" == "--all" ]; then
+  docker cp "$REAL_SRC/./" "$(docker-compose ps -q phpfpm|awk '{print $1}')":/var/www/html/
+  echo "Completed copying all files from host to container"
+  bin/fixowns
+  bin/fixperms
+else
+  if [ -f "$REAL_SRC/$1" ]; then
+    docker cp "$REAL_SRC/${1}" "$(docker-compose ps -q phpfpm|awk '{print $1}')":/var/www/html/"$1"
+  else
+    docker cp "$REAL_SRC/${1}" "$(docker-compose ps -q phpfpm|awk '{print $1}')":/var/www/html/"$(dirname "$1")"
+  fi
+  echo "Completed copying $1 from host to container"
+  bin/fixowns "$1"
+  bin/fixperms "$1"
+fi

bin/dev-test-run

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+[ -z "$1" ] && echo "Please specify test type (ex. integration)" && exit
+
+TEST_TYPE="$1"
+shift
+bin/clinotty bash -c "cd dev/tests/${TEST_TYPE} && ../../../vendor/bin/phpunit -c phpunit.xml.dist $*"

bin/devtools-cli-check

@@ -0,0 +1,7 @@
+#!/bin/bash
+if ! bin/clinotty ls /var/www/.composer-global/vendor/bin/cache-clean.js 1> /dev/null 2>&1; then
+  echo "Installing devtools metapackage, just a moment..."
+  bin/cliq mkdir -p /var/www/.composer-global
+  bin/composer require --working-dir=/var/www/.composer-global --quiet markshust/magento2-metapackage-devtools-cli:^1.0
+  echo "Devtools installed."
+fi

bin/download

@@ -1,31 +1,13 @@
 #!/bin/bash
-[ -z "$1" ] && echo "Please specify the version to download (ex. 2.0.0)" && exit
+set -o errexit
 
-edition=${2:-community}
+VERSION=${1:-2.4.2}
+EDITION=${2:-community}
 
-if [[ "$edition" == "enterprise" ]]; then
-    rm -rf src
-    composer create-project --repository=https://repo.magento.com/ --ignore-platform-reqs magento/project-enterprise-edition=$1 src
-    exit 0
-fi
+bin/stop
+docker-compose -f docker-compose.yml up -d
+[ $? != 0 ] && echo "Failed to start Docker services" && exit
 
-if [ ! -f ~/.docker-magento/magento2-$1.tar.gz ]; then
-    mkdir -p ~/.docker-magento
-    (cd ~/.docker-magento && curl -fOL http://pubfiles.nexcess.net/magento/ce-packages/magento2-$1.tar.gz)
-fi
+bin/setup-composer-auth
 
-# Fallback download to hypernode if archive doesn't exist on Nexcess (smaller than 1MB)
-if [ $(find ~/.docker-magento/magento2-$1.tar.gz -size -1M) ]; then
-    (cd ~/.docker-magento && curl -o magento2-$1.tar.gz -fOL https://www.magento.mirror.hypernode.com/releases/magento-$1.tar.gz)
-fi
-
-# Final fallback. If no archive exists, let's use Composer!
-if [ ! -f ~/.docker-magento/magento2-$1.tar.gz ]; then
-    echo "Archive not found, or not yet available due to new version release."
-    echo "Attempting install with Composer..."
-    rm -rf src
-    composer create-project --repository=https://repo.magento.com/ --ignore-platform-reqs magento/project-community-edition=$1 src
-else
-    echo "Extracting magento2-$1.tar.gz to ./src"
-    mkdir -p src && tar xzf ~/.docker-magento/magento2-$1.tar.gz -o -C src
-fi
+bin/clinotty composer create-project --repository=https://repo.magento.com/ magento/project-"${EDITION}"-edition="${VERSION}" .

bin/fixowns

@@ -1,10 +1,10 @@
 #!/bin/bash
-echo "Correcting filesystem ownerships..."
+echo "Fixing filesystem ownerships..."
 
 if [ -z "$1" ]; then
   bin/rootnotty chown -R app:app /var/www/
 else
-  bin/rootnotty chown -R app:app /var/www/html/$1
+  bin/rootnotty chown -R app:app /var/www/html/"$1"
 fi
 
-echo "Filesystem ownerships corrected."
+echo "Filesystem ownerships fixed."

bin/fixperms

@@ -1,5 +1,5 @@
 #!/bin/bash
-echo "Correcting filesystem permissions..."
+echo "Fixing filesystem permissions..."
 
 if [ -z "$1" ]; then
   bin/clinotty find var vendor pub/static pub/media app/etc \( -type f -or -type d \) -exec chmod u+w {} +;
@@ -8,4 +8,4 @@ else
   bin/clinotty find "$1" \( -type f -or -type d \) -exec chmod u+w {} +;
 fi
 
-echo "Filesystem permissions corrected."
+echo "Filesystem permissions fixed."

bin/mysql

@@ -1,9 +1,11 @@
 #!/bin/bash
+
+# shellcheck source=../env/db.env
 source env/db.env
 if [ -t 0 ]; then
   # Need tty to run mysql shell
-  bin/cli mysql -h${MYSQL_HOST} -u${MYSQL_USER} -p${MYSQL_PASSWORD} ${MYSQL_DATABASE} "$@"
+  bin/cli mysql -h"${MYSQL_HOST}" -u"${MYSQL_USER}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" "$@"
 else
   # Read from stdin, ex: bin/mysql < dbdump.sql
-  bin/clinotty mysql -h${MYSQL_HOST} -u${MYSQL_USER} -p${MYSQL_PASSWORD} ${MYSQL_DATABASE} "$@"
+  bin/clinotty mysql -h"${MYSQL_HOST}" -u"${MYSQL_USER}" -p"${MYSQL_PASSWORD}" "${MYSQL_DATABASE}" "$@"
 fi