Fix check for new installation.

Check that files and db directories are empty rather than a check for the existence of WP_ROOT. The latter approach fails as the recommendation is to create the root dataset as well as the child datasets files and db.

wordpress-jail.sh

@@ -94,10 +94,13 @@ if [ ${WP_ROOT:0:1} != "/" ]; then
 fi
 WP_ROOT="${WP_ROOT%/}"
 
-# Check that this is a new installation 
-if [ -e "${POOL_PATH}${WP_ROOT}" ]
+DB_PATH=${POOL_PATH}${WP_ROOT}/db
+FILES_PATH=${POOL_PATH}${WP_ROOT}/files
+
+# Check that this is a new installation
+if [ "$(ls -A "${FILES_PATH}")" ] || [ "$(ls -A "${DB_PATH}")" ]
 then
-  print_err "This script only works for new installations. The script cannot proceed if WP_ROOT exists."
+  print_err "This script only works for new installations. The script cannot proceed if ${FILES_PATH} and ${DB_PATH} are not both empty."
   exit 1
 fi
 
@@ -161,9 +164,6 @@ rm /tmp/pkg.json
 #####################################################################
 print_msg "Directory Creation and Mounting..."
 
-DB_PATH=${POOL_PATH}${WP_ROOT}/db
-FILES_PATH=${POOL_PATH}${WP_ROOT}/files
-
 mkdir -p "${DB_PATH}"
 chown -R 88:88 "${DB_PATH}"
 iocage fstab -a "${JAIL_NAME}" "${DB_PATH}"  /var/db/mysql  nullfs  rw  0  0