|
3 | 3 | # URL: https://github.com/zevilz/WebServerCloudBackups |
4 | 4 | # Author: zEvilz |
5 | 5 | # License: MIT |
6 | | -# Version: 1.10.0 |
| 6 | +# Version: 1.10.1 |
7 | 7 |
|
8 | 8 | checkFilePermissions() |
9 | 9 | { |
@@ -34,6 +34,7 @@ CLOUD_SUBDIR_FILES= |
34 | 34 | CLOUD_SUBDIR_BASES= |
35 | 35 | SCRIPT_INSTANCE_KEY=$(tr -cd 'a-zA-Z0-9' < /dev/urandom | head -c 10) |
36 | 36 | SCRIPT_ERRORS_TMP="/tmp/wscb.tmp.${SCRIPT_INSTANCE_KEY}" |
| 37 | +MYSQLDUMP="mysqldump" |
37 | 38 |
|
38 | 39 | . "${CUR_PATH}/backup.conf" |
39 | 40 |
|
@@ -171,6 +172,10 @@ if [[ "$SORT_BACKUPS" == "true" ]]; then |
171 | 172 | CLOUD_SUBDIR_BASES="/databases" |
172 | 173 | fi |
173 | 174 |
|
| 175 | +if command -v mariadb-dump >/dev/null 2>&1; then |
| 176 | + MYSQLDUMP="mariadb-dump" |
| 177 | +fi |
| 178 | + |
174 | 179 | # projects loop |
175 | 180 | for i in "${!projects[@]}" |
176 | 181 | do |
|
604 | 609 |
|
605 | 610 | DUMP_SINGLE_TRANSACTION_FAIL=0 |
606 | 611 |
|
607 | | - mysqldump --insert-ignore --skip-lock-tables --single-transaction=TRUE --add-drop-table --no-tablespaces -u "$MYSQL_USER" --password="$MYSQL_PASS" "$PROJECT_DB" 2>"$SCRIPT_ERRORS_TMP" | gzip > "$MYSQL_DUMP_PATH" |
| 612 | + $MYSQLDUMP --insert-ignore --skip-lock-tables --single-transaction=TRUE --add-drop-table --no-tablespaces -u "$MYSQL_USER" --password="$MYSQL_PASS" "$PROJECT_DB" 2>"$SCRIPT_ERRORS_TMP" | gzip > "$MYSQL_DUMP_PATH" |
608 | 613 |
|
609 | 614 | DUMP_ERRORS=$(cat "$SCRIPT_ERRORS_TMP" 2>/dev/null | grep -v 'Using a password' 2>&1) |
610 | 615 | DUMP_ERRORS=$(echo "$DUMP_ERRORS" | grep -v 'Forcing protocol to' 2>&1) |
|
639 | 644 | if [ "$DUMP_SINGLE_TRANSACTION_FAIL" -eq 1 ]; then |
640 | 645 | echo -n "Creating database dump (disabled --single-transaction)..." |
641 | 646 |
|
642 | | - mysqldump --insert-ignore --skip-lock-tables --add-drop-table --no-tablespaces -u "$MYSQL_USER" --password="$MYSQL_PASS" "$PROJECT_DB" 2>"$SCRIPT_ERRORS_TMP" | gzip > "$MYSQL_DUMP_PATH" |
| 647 | + $MYSQLDUMP --insert-ignore --skip-lock-tables --add-drop-table --no-tablespaces -u "$MYSQL_USER" --password="$MYSQL_PASS" "$PROJECT_DB" 2>"$SCRIPT_ERRORS_TMP" | gzip > "$MYSQL_DUMP_PATH" |
643 | 648 |
|
644 | 649 | DUMP_ERRORS=$(cat "$SCRIPT_ERRORS_TMP" 2>/dev/null | grep -v 'Using a password' 2>&1) |
645 | 650 | DUMP_ERRORS=$(echo "$DUMP_ERRORS" | grep -v 'Forcing protocol to' 2>&1) |
|
0 commit comments