From 4531bbe4c93a75b7813d5f2ef8f67367701aef1a Mon Sep 17 00:00:00 2001 From: Daniele Scasciafratte Date: Mon, 15 Mar 2021 13:54:55 +0100 Subject: [PATCH] fix(noroot): on utilities --- provision/core/composer/provision.sh | 2 +- provision/core/phpcs/provision.sh | 10 +++++----- provision/core/wp-cli/provision.sh | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/provision/core/composer/provision.sh b/provision/core/composer/provision.sh index 0f5e4ec38..ba406a2e2 100644 --- a/provision/core/composer/provision.sh +++ b/provision/core/composer/provision.sh @@ -26,7 +26,7 @@ function composer_setup() { chmod +x "composer.phar" mv "composer.phar" "/usr/local/bin/composer" vvv_info " * Forcing composer to v1.x" - composer selfupdate --1 + noroot composer selfupdate --1 vvv_success " * Composer installer steps completed" fi diff --git a/provision/core/phpcs/provision.sh b/provision/core/phpcs/provision.sh index 6392686ac..4e54c573f 100644 --- a/provision/core/phpcs/provision.sh +++ b/provision/core/phpcs/provision.sh @@ -10,7 +10,7 @@ function php_codesniff_setup() { vvv_info " * Upgrading from old PHPCS setup" rm -rf /srv/www/phpcs fi - + # PHP_CodeSniffer (for running WordPress-Coding-Standards) # Sniffs WordPress Coding Standards vvv_info " * Provisioning PHP_CodeSniffer (phpcs), see https://github.com/squizlabs/PHP_CodeSniffer" @@ -18,14 +18,14 @@ function php_codesniff_setup() { noroot mkdir -p /srv/www/phpcs cd /srv/www/phpcs COMPOSER_BIN_DIR="bin" noroot composer require --update-with-all-dependencies "dealerdirect/phpcodesniffer-composer-installer" "wp-coding-standards/wpcs" "automattic/vipwpcs" "phpcompatibility/php-compatibility" "phpcompatibility/phpcompatibility-paragonie" "phpcompatibility/phpcompatibility-wp" --no-ansi --no-progress - + vvv_info " * Symlinking phpcs and phcbf into /usr/local/bin" # Link `phpcbf` and `phpcs` to the `/usr/local/bin` directory so # that it can be used on the host in an editor with matching rules - ln -sf "/srv/www/phpcs/bin/phpcbf" "/usr/local/bin/phpcbf" - ln -sf "/srv/www/phpcs/bin/phpcs" "/usr/local/bin/phpcs" - + noroot ln -sf "/srv/www/phpcs/bin/phpcbf" "/usr/local/bin/phpcbf" + noroot ln -sf "/srv/www/phpcs/bin/phpcs" "/usr/local/bin/phpcs" + vvv_info " * Setting WordPress-Core as the default PHPCodesniffer standard" # Install the standards in PHPCS diff --git a/provision/core/wp-cli/provision.sh b/provision/core/wp-cli/provision.sh index 048419b3e..736541016 100644 --- a/provision/core/wp-cli/provision.sh +++ b/provision/core/wp-cli/provision.sh @@ -29,13 +29,13 @@ function wp_cli_setup() { chown vagrant /srv/config/wp-cli/wp-completion.bash else vvv_info " * Updating wp-cli..." - wp --allow-root cli update --nightly --yes + noroot wp cli update --nightly --yes vvv_success " * WP CLI Nightly updated" fi if [ "${VVV_DOCKER}" != 1 ]; then vvv_info " * Installing WP CLI doctor sub-command" - wp --allow-root package install git@github.com:wp-cli/doctor-command.git + noroot wp package install git@github.com:wp-cli/doctor-command.git vvv_info " * Installed WP CLI doctor sub-command" fi }