Permalink
Browse files

right path

  • Loading branch information...
Mte90 committed Jan 8, 2019
1 parent d17d708 commit 0e638616a5bf693bec0f2485be1ce0bf5086207b
Showing with 11 additions and 59 deletions.
  1. +0 −44 bin/develop_git
  2. +9 −13 provision/vvv-init.sh
  3. +1 −1 provision/vvv-nginx.conf.tmpl
  4. +1 −1 wp-cli.yml

This file was deleted.

Oops, something went wrong.
@@ -17,31 +17,27 @@ mkdir -p ${VVV_PATH_TO_SITE}/log
touch ${VVV_PATH_TO_SITE}/log/error.log
touch ${VVV_PATH_TO_SITE}/log/access.log

# Install and configure the latest stable version of WordPress
# Install and configure the latest stable version of ClassicPress
if [[ ! -f "${VVV_PATH_TO_SITE}/public_html/src/wp-load.php" ]]; then
echo "Checking out WordPress trunk. See https://develop.svn.wordpress.org/trunk"
noroot svn checkout "https://develop.svn.wordpress.org/trunk/" "${VVV_PATH_TO_SITE}/public_html"
echo "Checking out ClassicPress trunk. See https://github.com/ClassicPress/ClassicPress"
noroot git clone "https://github.com/ClassicPress/ClassicPress" "${VVV_PATH_TO_SITE}/public_html"
cd "${VVV_PATH_TO_SITE}/public_html"
noroot npm install
else
cd "${VVV_PATH_TO_SITE}/public_html"
echo "Updating WordPress trunk. See https://develop.svn.wordpress.org/trunk"
if [[ -e .svn ]]; then
noroot svn up
echo "Updating ClassicPress trunk. See https://github.com/ClassicPress/ClassicPress"
if [[ $(noroot git rev-parse --abbrev-ref HEAD) == 'develop' ]]; then
noroot git pull --no-edit
else
if [[ $(noroot git rev-parse --abbrev-ref HEAD) == 'master' ]]; then
noroot git pull --no-edit git://develop.git.wordpress.org/ master
else
echo "Skip auto git pull on develop.git.wordpress.org since not on master branch"
fi
echo "Skip auto git pull on classicpress since not on develop branch"
fi
noroot npm install &>/dev/null
noroot grunt
fi

if [[ ! -f "${VVV_PATH_TO_SITE}/public_html/wp-config.php" ]]; then
cd "${VVV_PATH_TO_SITE}/public_html"
echo "Configuring WordPress trunk..."
echo "Configuring ClassicPress trunk..."
noroot wp core config --dbname="${DB_NAME}" --dbuser=wp --dbpass=wp --quiet --path="${VVV_PATH_TO_SITE}/public_html/src" --extra-php <<PHP
define( 'WP_DEBUG', true );
define( 'SCRIPT_DEBUG', true );
@@ -52,7 +48,7 @@ fi

if ! $(noroot wp core is-installed --path="${VVV_PATH_TO_SITE}/public_html/src"); then
cd ${VVV_PATH_TO_SITE}
echo "Installing WordPress trunk..."
echo "Installing ClassicPress trunk..."

if [ "${WP_TYPE}" = "subdomain" ]; then
INSTALL_COMMAND="multisite-install --subdomains"
@@ -2,7 +2,7 @@ server {
listen 80;
listen 443 ssl;
server_name {vvv_hosts};
root {vvv_path_to_site}/public_html/build;
root {vvv_path_to_site}/public_html/src;

# Nginx logs
error_log {vvv_path_to_site}/log/error.log;
@@ -1 +1 @@
path: public_html/build
path: public_html/src

0 comments on commit 0e63861

Please sign in to comment.