fix: bad exit 1 syntax on success

CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## v1.2.1 (2024-02-15)
+
+- Fix a bug introduced in the last version that would exit with code 1 even with success due to bad syntax
+
 ## v1.2.0 (2024-02-08)
 
 - Adds file checks on output database exports to ensure they are valid

src/srvinfra.sh

@@ -33,7 +33,10 @@ export_database() {
     local sql_filename
     sql_filename=${4:-"database.sql"}
 
-    docker exec -i "$1" "$SRVINFRA_DATABASE_BACKUP_EXECUTABLE" -uroot -p"$2" "$3" >"$sql_filename" || echo "Could not export database!" && exit 1
+    docker exec -i "$1" "$SRVINFRA_DATABASE_BACKUP_EXECUTABLE" -uroot -p"$2" "$3" >"$sql_filename" || {
+        echo "Could not export database!"
+        exit 1
+    }
 
     # Check if we generate a proper export
     if [[ $(file "$sql_filename") != *ASCII\ text || ! -s "$sql_filename" ]]; then
@@ -51,7 +54,10 @@ export_database_secure() {
     local sql_filename
     sql_filename=${4:-"database.enc.gz"}
 
-    docker exec -i "$1" "$SRVINFRA_DATABASE_BACKUP_EXECUTABLE" -uroot -p"$2" "$3" | gzip -c | openssl enc -aes-256-cbc -md sha512 -pbkdf2 -k "$2" >"$sql_filename" || echo "Could not export database!" && exit 1
+    docker exec -i "$1" "$SRVINFRA_DATABASE_BACKUP_EXECUTABLE" -uroot -p"$2" "$3" | gzip -c | openssl enc -aes-256-cbc -md sha512 -pbkdf2 -k "$2" >"$sql_filename" || {
+        echo "Could not export database!"
+        exit 1
+    }
 
     # Check if we generate a proper export
     if [[ $(file "$sql_filename") != *"openssl enc'd data with salted password" || ! -s "$sql_filename" ]]; then