From 8eccb0ed5943a7f87614bced17cade93521ef606 Mon Sep 17 00:00:00 2001 From: Hartmut Bauer Date: Sun, 11 May 2025 14:56:45 +0200 Subject: [PATCH] sort tar archive --- main.inc.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main.inc.sh b/main.inc.sh index 0a94f3f..225541c 100755 --- a/main.inc.sh +++ b/main.inc.sh @@ -435,8 +435,8 @@ backup_dir() { local root=$1 local archive=$2 local dir=$3 - log $DEBUG "$DBG > tar -c -z --numeric-owner --one-file-system --exclude \"@eaDir\" -C \"$root\" \"$dir\" | gpg --batch -c --passphrase xxxx -o \"$archive\"" - tar -c -z --numeric-owner --one-file-system --exclude "@eaDir" -C "$root" "$dir" 2>>$LOG_FILE | gpg --batch -c --passphrase $PASSPHRASE -o "$archive" 2>>$LOG_FILE + log $DEBUG "$DBG > tar -c -z --numeric-owner --one-file-system --sort=name --exclude \"@eaDir\" -C \"$root\" \"$dir\" | gpg --batch -c --passphrase xxxx -o \"$archive\"" + tar -c -z --numeric-owner --one-file-system --sort=name --exclude "@eaDir" -C "$root" "$dir" 2>>$LOG_FILE | gpg --batch -c --passphrase $PASSPHRASE -o "$archive" 2>>$LOG_FILE check_pipe_rc ${PIPESTATUS[@]} return $? } @@ -642,7 +642,7 @@ list_archives() { local target=$1 local targ=${NAS_ROOT//\//\\\/} # slashes escapen log $DEBUG "$DBG > find \"$NAS_ROOT\" -type f -name \"*.$EXT\" | sed -E \"s/^$targ//\"" - find "$NAS_ROOT" -type f -name "*.$EXT" 2>>$LOG_FILE | sed -E "s/^$targ//" 2>>$LOG_FILE + find "$NAS_ROOT" -type f -name "*.$EXT" 2>>$LOG_FILE | sed -E "s/^$targ//" 2>>$LOG_FILE | sort check_pipe_rc ${PIPESTATUS[@]} return $? }