Bug fixes

PDowney · PDowney · commit 620cfa53332c · 2023-09-22T00:19:40.000-04:00
diff --git a/scripts/functions/alias/alias-cache.sh b/scripts/functions/alias/alias-cache.sh
@@ -27,7 +27,7 @@ fi
 for i in "${SITES[@]}"
 do
 	cd "/var/www/sites/$i/html"
-  /usr/local/src/wp transient delete-all --allow-root
+  wp transient delete-all --allow-root
 done
 
 rm -rf /var/cache/nginx/*
diff --git a/scripts/functions/cron/checksums.sh b/scripts/functions/cron/checksums.sh
@@ -38,7 +38,7 @@ for i in "${SITES[@]}"
 do
 	cd "/var/www/sites/$i/html"
 	# Verify checksums
-	if ! /usr/local/src/wp core verify-checksums --allow-root; then
+	if ! wp core verify-checksums --allow-root; then
 		ERRORS="$ERRORS $i"
 	fi
 done
diff --git a/scripts/functions/cron/daily-database-backup.sh b/scripts/functions/cron/daily-database-backup.sh
@@ -48,7 +48,7 @@ do
 	cd "/var/www/sites/$i/html"
 
 	# Local Database Backup
-	/usr/local/src/wp db export "/home/EngineScript/site-backups/$i/database/daily/$DATABASE_FILE" --add-drop-table --allow-root
+	wp db export "/home/EngineScript/site-backups/$i/database/daily/$DATABASE_FILE" --add-drop-table --allow-root
 
 	# Compress Database
 	gzip -f "/home/EngineScript/site-backups/$i/database/daily/$DATABASE_FILE"
diff --git a/scripts/functions/cron/hourly-database-backup.sh b/scripts/functions/cron/hourly-database-backup.sh
@@ -48,7 +48,7 @@ do
 	cd "/var/www/sites/$i/html"
 
 	# Local Database Backup
-	/usr/local/src/wp db export "/home/EngineScript/site-backups/$i/database/hourly/$DATABASE_FILE" --add-drop-table --allow-root
+	wp db export "/home/EngineScript/site-backups/$i/database/hourly/$DATABASE_FILE" --add-drop-table --allow-root
 
 	# Compress Database
 	gzip -f "/home/EngineScript/site-backups/$i/database/hourly/$DATABASE_FILE"
diff --git a/scripts/functions/cron/wp-cli-update.sh b/scripts/functions/cron/wp-cli-update.sh
@@ -27,5 +27,5 @@ fi
 #----------------------------------------------------------------------------
 
 # Update WP-CLI
-echo "y" | /usr/local/src/wp cli update --stable --allow-root
-echo "y" | /usr/local/src/wp package update --allow-root
+echo "y" | wp cli update --stable --allow-root
+echo "y" | wp package update --allow-root
diff --git a/scripts/functions/cron/wp-cron.sh b/scripts/functions/cron/wp-cron.sh
@@ -34,5 +34,5 @@ for i in "${SITES[@]}"
 do
 	cd "/var/www/sites/$i/html"
 	#php -q wp-cron.php >/dev/null 2>&1
-	/usr/local/src/wp cron event run --due-now --allow-root
+	wp cron event run --due-now --allow-root
 done
diff --git a/scripts/functions/security/10up-vuln-scanner.sh b/scripts/functions/security/10up-vuln-scanner.sh
@@ -28,7 +28,7 @@ cd /var/www/sites
 printf "Please select the site you want to scan for vulnerabilities:\n"
 select d in */; do test -n "$d" && break; echo ">>> Invalid Selection"; done
 cd "$d"html && echo "10up Vulnerability Scanner is running. Scan may take a bit, standby for results."
-/usr/local/src/wp vuln status --allow-root
+wp vuln status --allow-root
 
 # Ask user to acknowledge that the scan has completed before moving on
 echo ""
diff --git a/scripts/functions/server-tools/wp-cli-doctor.sh b/scripts/functions/server-tools/wp-cli-doctor.sh
@@ -28,7 +28,7 @@ cd /var/www/sites
 printf "Please select the site you want to scan for issues\n"
 select d in */; do test -n "$d" && break; echo ">>> Invalid Selection"; done
 cd "$d"html && echo "WP-CLI Doctor is running. Scan may take a bit, standby for results."
-/usr/local/src/wp doctor check --allow-root
+wp doctor check --allow-root
 
 # Ask user to acknowledge that the scan has completed before moving on
 echo ""
diff --git a/scripts/install/tools/wordpress/wp-cli.sh b/scripts/install/tools/wordpress/wp-cli.sh
@@ -37,13 +37,13 @@ chown -R www-data:www-data .wp-cli/cache
 chmod 775 .wp-cli/cache
 
 # Install WP-CLI Extensions
-/usr/local/src/wp package install 10up/wpcli-vulnerability-scanner:dev-develop --allow-root
-/usr/local/src/wp package install johnbillion/ext --allow-root
-/usr/local/src/wp package install pantheon-systems/wp_launch_check --allow-root
-/usr/local/src/wp package install wearerequired/wp-cli-clear-opcache --allow-root
-/usr/local/src/wp package install wp-cli/cron-command --allow-root
-/usr/local/src/wp package install wp-cli/doctor-command:@stable --allow-root
-/usr/local/src/wp package install 10up/wpcli-vulnerability-scanner:dev-develop --allow-root
+wp package install 10up/wpcli-vulnerability-scanner:dev-develop --allow-root
+wp package install johnbillion/ext --allow-root
+wp package install pantheon-systems/wp_launch_check --allow-root
+wp package install wearerequired/wp-cli-clear-opcache --allow-root
+wp package install wp-cli/cron-command --allow-root
+wp package install wp-cli/doctor-command:@stable --allow-root
+wp package install 10up/wpcli-vulnerability-scanner:dev-develop --allow-root
 
 echo ""
 echo ""
diff --git a/scripts/install/vhost/vhost-backup.sh b/scripts/install/vhost/vhost-backup.sh
@@ -45,7 +45,7 @@ do
 	cd "/var/www/sites/$i/html"
 
 	# Backup database
-	/usr/local/src/wp db export "/home/EngineScript/site-backups/$i/database/daily/$DATABASE_FILE" --add-drop-table --allow-root
+	wp db export "/home/EngineScript/site-backups/$i/database/daily/$DATABASE_FILE" --add-drop-table --allow-root
 
 	# Compress database file
 	gzip -f "/home/EngineScript/site-backups/$i/database/daily/$DATABASE_FILE"
diff --git a/scripts/install/vhost/vhost-install.sh b/scripts/install/vhost/vhost-install.sh
@@ -235,7 +235,7 @@ touch /var/log/domains/${SITE_URL}/${SITE_URL}-wp-error.log
 chown -R www-data:www-data /var/log/domains/${SITE_URL}
 
 # Download WordPress using WP-CLI
-/usr/local/src/wp core download --allow-root
+wp core download --allow-root
 rm -f /var/www/sites/${SITE_URL}/html/wp-content/plugins/hello.php
 
 # Create wp-config.php
@@ -253,7 +253,7 @@ STRING='put your unique phrase here'
 printf '%s\n' "g/$STRING/d" a "$SALT" . w | ed -s /var/www/sites/${SITE_URL}/html/wp-config.php
 
 # WP Scan API Token
-sed -i "s|SED10UPAPI|${10UPAPI}|g" /var/www/sites/${SITE_URL}/html/wp-config.php
+sed -i "s|SEDWPSCANAPI|${WPSCANAPI}|g" /var/www/sites/${SITE_URL}/html/wp-config.php
 
 # Create robots.txt
 cp -rf /usr/local/bin/enginescript/var/www/wordpress/robots.txt /var/www/sites/${SITE_URL}/html/robots.txt
@@ -262,7 +262,6 @@ sed -i "s|SEDURL|${SITE_URL}|g" /var/www/sites/${SITE_URL}/html/robots.txt
 # WP File Permissions
 find /var/www/sites/${SITE_URL} -type d -print0 | sudo xargs -0 chmod 0755
 find /var/www/sites/${SITE_URL} -type f -print0 | sudo xargs -0 chmod 0644
-
 chown -R www-data:www-data /var/www/sites/${SITE_URL}
 chmod +x /var/www/sites/${SITE_URL}/html/wp-cron.php
 chmod 600 /var/www/sites/${SITE_URL}/html/wp-config.php
@@ -289,30 +288,30 @@ echo "============================================="
 
 # WP-CLI Install WordPress
 cd /var/www/sites/${SITE_URL}/html
-/usr/local/src/wp core install --admin_user=${WP_ADMIN_USERNAME} --admin_password=${WP_ADMIN_PASSWORD} --admin_email=${WP_ADMIN_EMAIL} --url=https://${SITE_URL} --title='New Site' --skip-email --allow-root
+wp core install --admin_user=${WP_ADMIN_USERNAME} --admin_password=${WP_ADMIN_PASSWORD} --admin_email=${WP_ADMIN_EMAIL} --url=https://${SITE_URL} --title='New Site' --skip-email --allow-root
 
 # WP-CLI Install Plugins
-/usr/local/src/wp plugin install autodescription --allow-root
-/usr/local/src/wp plugin install mariadb-health-checks --allow-root
-/usr/local/src/wp plugin install nginx-helper --allow-root
-/usr/local/src/wp plugin install php-compatibility-checker --allow-root
-/usr/local/src/wp plugin install redis-cache --allow-root
-/usr/local/src/wp plugin install theme-check --allow-root
-/usr/local/src/wp plugin install wp-cloudflare-page-cache --allow-root
-/usr/local/src/wp plugin install wp-mail-smtp --allow-root
+wp plugin install autodescription --allow-root
+wp plugin install mariadb-health-checks --allow-root
+wp plugin install nginx-helper --allow-root
+wp plugin install php-compatibility-checker --allow-root
+wp plugin install redis-cache --allow-root
+wp plugin install theme-check --allow-root
+wp plugin install wp-cloudflare-page-cache --allow-root
+wp plugin install wp-mail-smtp --allow-root
 
 # WP-CLI Activate Plugins
-/usr/local/src/wp plugin activate nginx-helper --allow-root
-/usr/local/src/wp plugin activate redis-cache --allow-root
-/usr/local/src/wp plugin activate wp-cloudflare-page-cache --allow-root
-/usr/local/src/wp plugin activate wp-mail-smtp --allow-root
+wp plugin activate nginx-helper --allow-root
+wp plugin activate redis-cache --allow-root
+wp plugin activate wp-cloudflare-page-cache --allow-root
+wp plugin activate wp-mail-smtp --allow-root
 
 # WP-CLI Enable Plugins
-/usr/local/src/wp redis enable --allow-root
+wp redis enable --allow-root
 
 # WP-CLI set permalink structure for FastCGI Cache
-/usr/local/src/wp option get permalink_structure --allow-root
-/usr/local/src/wp option update permalink_structure '/%category%/%postname%/' --allow-root
+wp option get permalink_structure --allow-root
+wp option update permalink_structure '/%category%/%postname%/' --allow-root
 
 # Setting Permissions Again
 # For whatever reason, using WP-CLI to install plugins with --allow-root reassigns
@@ -378,7 +377,7 @@ WPCONTENT_FILE="${NOW}-wp-content.gz";
 cd "/var/www/sites/${SITE_URL}/html"
 
 # Backup database
-/usr/local/src/wp db export "/home/EngineScript/site-backups/${SITE_URL}/database/daily/$DATABASE_FILE" --add-drop-table --allow-root
+wp db export "/home/EngineScript/site-backups/${SITE_URL}/database/daily/$DATABASE_FILE" --add-drop-table --allow-root
 
 # Compress database file
 gzip -f "/home/EngineScript/site-backups/${SITE_URL}/database/daily/$DATABASE_FILE"
diff --git a/scripts/update/software-update.sh b/scripts/update/software-update.sh
@@ -57,8 +57,8 @@ fi
 #/usr/local/bin/enginescript/scripts/update/python-update.sh
 
 # Update WP-CLI
-echo "y" | /usr/local/src/wp cli update --stable --allow-root
-echo "y" | /usr/local/src/wp package update --allow-root
+echo "y" | wp cli update --stable --allow-root
+echo "y" | wp package update --allow-root
 
 # Update WP-Scan
 gem update wpscan
