Skip to content

Commit 5e5362a

Browse files
PDowneyPDowney
authored
Suppress tar warnings
Also ensured all tar commands are standardized across the codebase
1 parent 6d9bb15 commit 5e5362a

8 files changed

Lines changed: 13 additions & 15 deletions

File tree

‎scripts/functions/backup/nginx-backup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ WPCONFIG_FILE="${NOW}-wp-config.php.gz";
2929
WPCONTENT_FILE="${NOW}-wp-content.gz";
3030

3131
# Backup Nginx Config
32-
tar -zcf "/home/EngineScript/config-backups/nginx/${NGINX_FILE}" /etc/nginx
32+
tar --no-warning=removal -zcf "/home/EngineScript/config-backups/nginx/${NGINX_FILE}" /etc/nginx
3333

3434
# Remove Old Nginx Backups
3535
find /home/EngineScript/config-backups/nginx -type f -mtime +15 | xargs rm -fR

‎scripts/functions/backup/php-backup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ WPCONFIG_FILE="${NOW}-wp-config.php.gz";
2929
WPCONTENT_FILE="${NOW}-wp-content.gz";
3030

3131
# Backup PHP Config
32-
tar -zcf "/home/EngineScript/config-backups/php/${PHP_FILE}" /etc/php
32+
tar --no-warning=removal -zcf "/home/EngineScript/config-backups/php/${PHP_FILE}" /etc/php
3333

3434
# Remove Old PHP Backups
3535
find /home/EngineScript/config-backups/php -type f -mtime +30 | xargs rm -fR

‎scripts/functions/backup/weekly-wp-content-backup.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ do
4141

4242
# Local WP-Content Backup
4343
mkdir -p "/home/EngineScript/site-backups/$i/wp-content/weekly/${NOW}"
44-
tar -zcf "/home/EngineScript/site-backups/$i/wp-content/weekly/${WPCONTENT_FILE}" wp-content
44+
tar --no-warning=removal -zcf "/home/EngineScript/site-backups/$i/wp-content/weekly/${WPCONTENT_FILE}" wp-content
4545

4646
# Amazon S3 WP-Content Backup
4747
if [ "$INSTALL_S3_BACKUP" = 1 ] && [ "$S3_BUCKET_NAME" != PLACEHOLDER ] && [ "$WEEKLY_S3_WPCONTENT_BACKUP" = 1 ];

‎scripts/functions/security/wordfence-cli-remediate.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ mkdir -p "/home/EngineScript/site-backups/${d}/wordfence-cli-remediate-backup/${
5252
wp db export --path="/var/www/sites/${d}/html" "/home/EngineScript/site-backups/${d}/wordfence-cli-remediate-backup/${NOW}/${DATABASE_FILE}" --add-drop-table --allow-root
5353

5454
# Export files locally
55-
tar -zcvf "/home/EngineScript/site-backups/${d}/wordfence-cli-remediate-backup/${NOW}/${FULLWPFILES}" html
55+
tar --no-warning=removal -zcf "/home/EngineScript/site-backups/${d}/wordfence-cli-remediate-backup/${NOW}/${FULLWPFILES}" html
5656

5757
echo -e "\nBackup completed.
5858
\n\nIf something goes wrong, the backup files can be found in in:

‎scripts/functions/vhost/vhost-backup.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ do
5656
#tar -zcf "/home/EngineScript/site-backups/${i}/wp-uploads/${UPLOADS_FILE}" wp-content/uploads
5757

5858
# Backup uploads, themes, and plugins
59-
tar -zcf "/home/EngineScript/site-backups/${i}/wp-content/${WPCONTENT_FILE}" wp-content
59+
tar --no-warning=removal -zcf "/home/EngineScript/site-backups/${i}/wp-content/${WPCONTENT_FILE}" wp-content
6060

6161
# Nginx vhost backup
6262
gzip -cf "/etc/nginx/sites-enabled/${i}.conf" > "/home/EngineScript/site-backups/${i}/nginx/${VHOST_FILE}"
6363

6464
# SSL keys backup
65-
tar -zcf "/home/EngineScript/site-backups/${i}/ssl-keys/${SSL_FILE}" "/etc/nginx/ssl/${i}"
65+
tar --no-warning=removal -zcf "/home/EngineScript/site-backups/${i}/ssl-keys/${SSL_FILE}" "/etc/nginx/ssl/${i}"
6666

6767
# wp-config.php backup
6868
gzip -cf "/var/www/sites/${i}/html/wp-config.php" > "/home/EngineScript/site-backups/${i}/wp-config/${WPCONFIG_FILE}"

‎scripts/functions/vhost/vhost-export.sh‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,7 @@ echo "Exporting site files for ${SELECTED_SITE}..."
115115
cd "/var/www/sites/${SELECTED_SITE}/" || exit 1
116116

117117
# Archive the contents of the html directory
118-
tar czf "${FILES_EXPORT_PATH}" -C html .
119-
# Alternative: Archive the 'html' directory itself (import script needs adjustment)
120-
# tar czf "${FILES_EXPORT_PATH}" html
118+
tar --no-warning=removal -zcf "${FILES_EXPORT_PATH}" -C html .
121119

122120
if [ $? -ne 0 ]; then
123121
echo "ERROR: Failed to create site files archive for ${SELECTED_SITE}"

‎scripts/functions/vhost/vhost-import.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ elif [[ "$IMPORT_FORMAT" == "two_file" ]]; then
243243
unzip -q "${WP_ARCHIVE_FILE}" -d "${WP_EXTRACTED_PATH}"
244244
EXTRACT_STATUS=$?
245245
elif [[ "${WP_ARCHIVE_FILE}" == *.tar.gz || "${WP_ARCHIVE_FILE}" == *.tgz ]]; then
246-
tar xzf "${WP_ARCHIVE_FILE}" -C "${WP_EXTRACTED_PATH}"
246+
tar -zxf "${WP_ARCHIVE_FILE}" -C "${WP_EXTRACTED_PATH}"
247247
EXTRACT_STATUS=$?
248248
else
249249
echo "FAILED: Unrecognized archive format for ${WP_ARCHIVE_FILE}"
@@ -301,7 +301,7 @@ if [[ "${WP_ARCHIVE_FILE}" == *.zip ]]; then
301301
unzip -q "${WP_ARCHIVE_FILE}" -d "${WP_EXTRACTED_PATH}"
302302
EXTRACT_STATUS=$?
303303
elif [[ "${WP_ARCHIVE_FILE}" == *.tar.gz || "${WP_ARCHIVE_FILE}" == *.tgz ]]; then
304-
tar xzf "${WP_ARCHIVE_FILE}" -C "${WP_EXTRACTED_PATH}"
304+
tar --no-warning=removal -zxf "${WP_ARCHIVE_FILE}" -C "${WP_EXTRACTED_PATH}"
305305
EXTRACT_STATUS=$?
306306
else
307307
echo "FAILED: Unrecognized archive format for ${WP_ARCHIVE_FILE}"
@@ -786,13 +786,13 @@ wp db export "/home/EngineScript/site-backups/${SITE_URL}/database/daily/$DATABA
786786
gzip -f "/home/EngineScript/site-backups/${SITE_URL}/database/daily/$DATABASE_FILE"
787787

788788
# Backup uploads, themes, and plugins (wp-content)
789-
tar -zcf "/home/EngineScript/site-backups/${SITE_URL}/wp-content/$WPCONTENT_FILE" wp-content
789+
tar --no-warning=removal -zcf "/home/EngineScript/site-backups/${SITE_URL}/wp-content/$WPCONTENT_FILE" wp-content
790790

791791
# Nginx vhost backup
792792
gzip -cf "/etc/nginx/sites-enabled/${SITE_URL}.conf" > "/home/EngineScript/site-backups/${SITE_URL}/nginx/${VHOST_FILE}"
793793

794794
# SSL keys backup
795-
tar -zcf "/home/EngineScript/site-backups/${SITE_URL}/ssl-keys/${SSL_FILE}" "/etc/nginx/ssl/${SITE_URL}"
795+
tar --no-warning=removal -zcf "/home/EngineScript/site-backups/${SITE_URL}/ssl-keys/${SSL_FILE}" "/etc/nginx/ssl/${SITE_URL}"
796796

797797
# wp-config.php backup
798798
gzip -cf "${TARGET_WP_PATH}/wp-config.php" > "/home/EngineScript/site-backups/${SITE_URL}/wp-config/${WPCONFIG_FILE}"

‎scripts/functions/vhost/vhost-install.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,13 +453,13 @@ gzip -f "/home/EngineScript/site-backups/${SITE_URL}/database/daily/$DATABASE_FI
453453
#tar -zcf "/home/EngineScript/site-backups/${SITE_URL}/wp-uploads/$UPLOADS_FILE" wp-content/uploads
454454

455455
# Backup uploads, themes, and plugins
456-
tar -zcf "/home/EngineScript/site-backups/${SITE_URL}/wp-content/$WPCONTENT_FILE" wp-content
456+
tar --no-warning=removal -zcf "/home/EngineScript/site-backups/${SITE_URL}/wp-content/$WPCONTENT_FILE" wp-content
457457

458458
# Nginx vhost backup
459459
gzip -cf "/etc/nginx/sites-enabled/${SITE_URL}.conf" > "/home/EngineScript/site-backups/${SITE_URL}/nginx/$VHOST_FILE"
460460

461461
# SSL keys backup
462-
tar -zcf "/home/EngineScript/site-backups/${SITE_URL}/ssl-keys/$SSL_FILE" "/etc/nginx/ssl/${SITE_URL}"
462+
tar --no-warning=removal -zcf "/home/EngineScript/site-backups/${SITE_URL}/ssl-keys/$SSL_FILE" "/etc/nginx/ssl/${SITE_URL}"
463463

464464
# wp-config.php backup
465465
gzip -cf "/var/www/sites/${SITE_URL}/html/wp-config.php" > "/home/EngineScript/site-backups/${SITE_URL}/wp-config/$WPCONFIG_FILE"

0 commit comments

Comments
 (0)