Enchancing user experience of wordpress script

diff --git a/manifests/init.pp b/manifests/init.pp
index f454ce5a847e5a5731b05c2a9b987a9f26d30c4f..aa245935eb13d5d183bb1ef4c62c245d461414bc 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -22,6 +22,12 @@ class wordpress {
     mode    => 755,
   }
 
+  file { "/usr/local/sbin/wp":
+    ensure  => '/usr/local/sbin/wordpress',
+    owner   => root,
+    group   => root,
+  }
+
   vcsrepo { "/usr/local/share/wp-cli":
     ensure   => present,
     provider => git,

diff --git a/templates/wordpress.sh.erb b/templates/wordpress.sh.erb
index a6626c6d8c28f33eb590bd0ab2b5622747e04133..02b97e23bf07bb8b69c49563f2c41285d08b1022 100644 (file)
--- a/templates/wordpress.sh.erb
+++ b/templates/wordpress.sh.erb
@@ -128,7 +128,11 @@ function wordpress_upgrade {
 
 # Usage
 function wordpress_usage {
-  echo "Usage: `basename $0` <deploy|upgrade> [arguments]"
+  /usr/local/share/wp-cli/src/bin/wp help
+  echo ""
+  echo "Installation management commands:"
+  echo "    wp deploy <version>"
+  echo "    wp upgrade <old-version> <new-version>"
 }
 
 # Main procedure
@@ -143,7 +147,8 @@ elif [ "$1" == "upgrade" ]; then
   wordpress_upgrade $*
 elif [ "$1" == "help" ]; then
   wordpress_usage
-  /usr/local/share/wp-cli/src/bin/wp help
+elif [ "$1" == "core" ]; then
+  echo "Please use deploy or upgrade instead."
 else
   # Send all other requests to wp-cli 
   /usr/local/share/wp-cli/src/bin/wp $*