From 098fbaa46f307c298828b2840efbd2074c549d0b Mon Sep 17 00:00:00 2001
From: Joshua Westerheide <dev@jdoubleu.de>
Date: Sun, 17 Nov 2019 04:24:30 +0100
Subject: [PATCH] WordPress: link wp to wp-cli, remove wrapper script (#1810)

---
 .../ddev-webserver/files/usr/local/bin/wp       | 17 +----------------
 docs/users/developer-tools.md                   |  2 +-
 pkg/version/version.go                          |  2 +-
 3 files changed, 3 insertions(+), 18 deletions(-)
 mode change 100755 => 120000 containers/ddev-webserver/files/usr/local/bin/wp

diff --git a/containers/ddev-webserver/files/usr/local/bin/wp b/containers/ddev-webserver/files/usr/local/bin/wp
deleted file mode 100755
index 78bcb9c2d9b..00000000000
--- a/containers/ddev-webserver/files/usr/local/bin/wp
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-##
-# WP-cli wrapper: Append path automatically so that user doesn't have to
-##
-if [ "$(id -u)" = "0" ]; then
-
-  # Gather all arguments because string interpolation doesn't work for $@
-  args=""
-  for i in "$@"; do
-      args="$args \"$i\""
-  done
-
-  /usr/local/bin/wp-cli "$@" --path=$WP_CORE --allow-root
-else
-  /usr/local/bin/wp-cli "$@" --path=$WP_CORE
-fi
diff --git a/containers/ddev-webserver/files/usr/local/bin/wp b/containers/ddev-webserver/files/usr/local/bin/wp
new file mode 120000
index 00000000000..0547bca9e83
--- /dev/null
+++ b/containers/ddev-webserver/files/usr/local/bin/wp
@@ -0,0 +1 @@
+wp-cli
\ No newline at end of file
diff --git a/docs/users/developer-tools.md b/docs/users/developer-tools.md
index 165b9cc61ef..9edeb36f6a2 100755
--- a/docs/users/developer-tools.md
+++ b/docs/users/developer-tools.md
@@ -6,7 +6,7 @@ Several useful developer tools are included inside the containers. Run `ddev des
 ### Command-line Tools in the Containers
 - MySQL Client (mysql) - Command-line interface for interacting with MySQL/MariaDB.
 - [Drush](http://www.drush.org) - Command-line shell and Unix scripting interface for Drupal.
-- [WP-CLI](http://wp-cli.org/) - Command-line tools for managing WordPress installations.
+- [WP-CLI](http://wp-cli.org/) - Command-line tools for managing WordPress installations, available both as "wp" and as "wp-cli".
 - npm and yarn
 - node
 - sqlite3
diff --git a/pkg/version/version.go b/pkg/version/version.go
index fc7ca9ec1f3..10c4bf06996 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -49,7 +49,7 @@ var DockerComposeFileFormatVersion = "3.6"
 var WebImg = "drud/ddev-webserver"
 
 // WebTag defines the default web image tag for drud dev
-var WebTag = "20191104_heddn_drush_node_version" // Note that this can be overridden by make
+var WebTag = "20191113_jdoubleu_wp_cli" // Note that this can be overridden by make
 
 // DBImg defines the default db image used for applications.
 var DBImg = "drud/ddev-dbserver"