simplify wordpress-config-info

2 files changed, 21 insertions, 43 deletions

diff --git a/wordpress/wordpress-config-info b/wordpress/wordpress-config-info
index bee8a4c..f7f19f9 100755
--- a/wordpress/wordpress-config-info
+++ b/wordpress/wordpress-config-info
@@ -11,44 +11,26 @@ wp_table_prefix_get()
         sed -e 's/\r//g' -ne "s/^\$table_prefix *= *'\\([^']*\\)';$/\\1/p"  "$wp_config"
 }
 
-case "$1" in
-        --table_prefix) shift; TABLE_PREFIX_ONLY=y ;;
-        --) shift ;;
-        -*) exit 1 ;;
-esac
-
-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/*/*) exit 1;;
-        /srv/*) SITE_DIR=$1/public_html ;;
-        */*) exit 1 ;;
-        .*) exit 1 ;;
-        *) SITE_DIR=/srv/$1/public_html ;;
-esac
-
-case "$SITE_DIR" in
-        /srv/*/*/*) exit 1 ;;
-        /srv/*/public_html) [ -d "$SITE_DIR" ] ;;
-        *) exit 1 ;;
-esac
+find_wp_config()
+{
+        case "$1" in
+                */*) ;;
+                *) set -- /srv/"$1" ;;
+        esac
+
+        for wp_config in "$1" "$1"/wp-config.php "$1"/wordpress/wp-config.php "$1"/public_html/wp-config.php "$1"/public_html/wordpress/wp-config.php
+        do
+                if [ -f "$wp_config" ]
+                then
+                        return
+                fi
+        done
+        false
+}
 
-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" ]
+[ $# = 1 ]
 
-if [ "$TABLE_PREFIX_ONLY" ]
-then
-        wp_table_prefix_get
-        exit
-fi
+find_wp_config "$1"
 
 db_name=$(wp_config_get DB_NAME)
 [ "$db_name" ]
@@ -72,8 +54,3 @@ jq -n \
          , db_name: $n
          , table_prefix: $prefix
          }'
-
-#jq -n --arg h test '{ db_host: $h }'
-#jq --arg h test '{ .db_host = $h }'
-#mysql --host="$db_host" --user="$db_user" --password="$db_password" "$db_name"
-
diff --git a/wordpress/worduser-list-users b/wordpress/worduser-list-users
index 049de68..ede3d3b 100755
--- a/wordpress/worduser-list-users
+++ b/wordpress/worduser-list-users
@@ -1,5 +1,6 @@
-#!/bin/bash -e
-prefix=$(./wordpress-mysql --table_prefix "$1")
+#!/bin/bash
+set -e
+prefix=$(wordpress-config-info "$1" | jq -r .table_prefix)
 wordpress-mysql "$1" <<END
 select id, user_login, user_pass from ${prefix}users;
 END