increase robustness to varying site configurations

1 files changed, 14 insertions, 7 deletions

diff --git a/other/wordpress-mysql b/other/wordpress-mysql
index 5c69693..cccc921 100755
--- a/other/wordpress-mysql
+++ b/other/wordpress-mysql
@@ -3,12 +3,12 @@ set -e
 
 wp_config_get()
 {
-        sed -n "s/^define( *'$1', *'\([^']*\)' *);/\1/p" < "$wp_config"
+        sed -e 's/\r//g' -ne "s/^define( *'$1', *'\([^']*\)' *);/\1/p" < "$wp_config"
 }
 
 wp_table_prefix_get()
 {
-        sed -ne "s/^\$table_prefix *= *'\\([^']*\\)';$/\\1/p"  "$wp_config"
+        sed -e 's/\r//g' -ne "s/^\$table_prefix *= *'\\([^']*\\)';$/\\1/p"  "$wp_config"
 }
 
 case "$1" in
@@ -17,15 +17,17 @@ case "$1" in
         -*) exit 1 ;;
 esac
 
-case "${1%/}" in
+case "$1" in
         '') exit 1 ;;
+        /srv/*/*/*/*) exit 1 ;;
+        /srv/*/public_html/wp-config.php) SITE_DIR=${1%/wp-config.php} ;;
         /srv/*/*/*) exit 1 ;;
-        /srv/*/public_html) SITE_DIR=${1%/} ;;
+        /srv/*/public_html) SITE_DIR=$1 ;;
         /srv/*/*) exit 1;;
-        /srv/*) SITE_DIR=${1%/}/public_html ;;
+        /srv/*) SITE_DIR=$1/public_html ;;
         */*) exit 1 ;;
         .*) exit 1 ;;
-        *) SITE_DIR=/srv/${1%/}/public_html ;;
+        *) SITE_DIR=/srv/$1/public_html ;;
 esac
 
 case "$SITE_DIR" in
@@ -34,7 +36,12 @@ case "$SITE_DIR" in
         *) exit 1 ;;
 esac
 
-wp_config=$SITE_DIR/wordpress/wp-config.php
+if [ -d "$SITE_DIR"/wordpress ]
+then
+        wp_config=$SITE_DIR/wordpress/wp-config.php
+else
+        wp_config=$SITE_DIR/wp-config.php
+fi
 [ -f "$wp_config" ]
 
 if [ "$TABLE_PREFIX_ONLY" ]