From b6cad4d231086bb95b47563aac75b6321dd70c8e Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 9 Jul 2021 13:23:56 +0000 Subject: [PATCH] pakfire: Put tar options into an array Signed-off-by: Michael Tremer --- src/pakfire/lib/functions.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/pakfire/lib/functions.sh b/src/pakfire/lib/functions.sh index 5918649db0..25bd4be1e0 100644 --- a/src/pakfire/lib/functions.sh +++ b/src/pakfire/lib/functions.sh @@ -22,16 +22,24 @@ . /etc/sysconfig/rc . $rc_functions +TAR_OPTIONS=( + --acls + --xattrs + --xattrs-include='*' + --no-overwrite-dir + --preserve-permissions + --numeric-owner +) + extract_files() { echo "Extracting files..." - tar --acls --xattrs --xattrs-include='*' \ - -xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + tar -xavf /opt/pakfire/tmp/files* "${TAR_OPTIONS[@]}" -C / echo "...Finished." } extract_backup_includes() { echo "Extracting backup includes..." - tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / \ + tar xavf /opt/pakfire/tmp/files* "${TAR_OPTIONS[@]}" -C / \ var/ipfire/backup/addons/includes echo "...Finished." } -- 2.39.2