diff --git a/CHANGELOG.md b/CHANGELOG.md index 621b8df0..a63a76a8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ * Updated DNS auto-configuration on linux systems to handle systemd-resolved usage. * Fixed issue on Ubuntu where dnsmasq container would fail to bind to port 53. * Fixed issue where lack of `~/.composer` dir (resulting in creation by docker) can cause permissions error inside containers. +* Fixed issue with `bin/magento setup:install` allowing it to pass permissions checks (PR #2 by @fooman) +* Fixed issue where `env` and `env-init` commands failed to reset shell colors when printing error messages (issue #4 reported by @navarr) 0.1.2 =============== diff --git a/commands/env-init.cmd b/commands/env-init.cmd index 059b73be..54825c38 100644 --- a/commands/env-init.cmd +++ b/commands/env-init.cmd @@ -10,11 +10,11 @@ WARDEN_ENV_NAME="${WARDEN_PARAMS[0]:-}" WARDEN_ENV_TYPE="${WARDEN_PARAMS[1]:-magento2}" # Require the user inputs the required environment name parameter -[[ ! ${WARDEN_ENV_NAME} ]] && >&2 echo -e "\033[31mMissing required argument. Please use --help to to print usage." && exit 1 +[[ ! ${WARDEN_ENV_NAME} ]] && >&2 echo -e "\033[31mMissing required argument. Please use --help to to print usage.\033[0m" && exit 1 # Verify the auto-select and/or type path resolves correctly before setting it [[ ! -f "${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}.base.yml" ]] \ - && >&2 echo -e "\033[31mInvalid environment type \"${WARDEN_ENV_TYPE}\" specified." && exit 1 + && >&2 echo -e "\033[31mInvalid environment type \"${WARDEN_ENV_TYPE}\" specified.\033[0m" && exit 1 # Write the .env file to current working directory cat > "${WARDEN_ENV_PATH}/.env" < Trusting root certificate (requires sudo privileges)" - sudo cp "${WARDEN_SSL_DIR}/rootca/certs/ca.cert.pem" /usr/local/share/ca-certificates/warden-proxy-local-ca.cert.pem + sudo cp "${WARDEN_SSL_DIR}/rootca/certs/ca.cert.pem" /usr/local/share/ca-certificates/warden-proxy-local-ca.crt sudo update-ca-certificates elif [[ "$OSTYPE" == "darwin"* ]] \ && ! security dump-trust-settings -d | grep 'Warden Proxy Local CA' >/dev/null \ diff --git a/environments/magento2.mutagen.toml b/environments/magento2.mutagen.toml index 258f9bae..1953a8fe 100644 --- a/environments/magento2.mutagen.toml +++ b/environments/magento2.mutagen.toml @@ -22,8 +22,10 @@ default = [ # Magento files "/generated", "/pub/media", - "/pub/static", - "/var", + "/pub/static/**", + "!/pub/static/.htaccess", + "/var/**", + "!/var/.htaccess", "node_modules", ]