From ddd4379f906fb84588093099a81d5ea633e6a7c7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 2 Aug 2018 23:57:57 -0400 Subject: Use Bash 4.4 @Q instead of %q --- src/abslibre-tools/libredbdiff | 4 ++-- src/abslibre-tools/librerelease | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'src/abslibre-tools') diff --git a/src/abslibre-tools/libredbdiff b/src/abslibre-tools/libredbdiff index 487b88f..293c144 100755 --- a/src/abslibre-tools/libredbdiff +++ b/src/abslibre-tools/libredbdiff @@ -2,7 +2,7 @@ # libredbdiff # # Copyright (C) 2014 Esteban Carnevale -# Copyright (C) 2014, 2017 Luke Shumaker +# Copyright (C) 2014, 2017-2018 Luke Shumaker # # License: GNU GPLv3+ # @@ -319,7 +319,7 @@ main_compare() { local tmpdir tmpdir="$(mktemp --tmpdir -d "$cmd.XXXXXXXXXX")" || die "Could not create temporary working directory" - trap "rm -rf -- $(printf %q "$tmpdir")" RETURN + trap "rm -rf -- ${tmpdir@Q}" RETURN local arch_packages_tmp="$tmpdir/arch-packages" local prbl_packages_tmp="$tmpdir/parabola-packages" diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 705efc5..3a987b2 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -5,7 +5,7 @@ # Copyright (C) 2010-2012 Joshua Ismael Haase Hernández (xihh) # Copyright (C) 2010-2013 Nicolás Reynolds # Copyright (C) 2013 Michał Masłowski -# Copyright (C) 2013-2014, 2017 Luke Shumaker +# Copyright (C) 2013-2014, 2017-2018 Luke Shumaker # # For just the create_signature() function: # Copyright (C) 2006-2013 Pacman Development Team @@ -232,7 +232,7 @@ clean() { local file_list file_list="$(mktemp -t "${0##*/}.XXXXXXXXXX")" - trap "$(printf 'rm -f -- %q' "$file_list")" EXIT + trap "rm -f -- ${file_list@Q}" EXIT list0_files > "$file_list" lock_close 8 @@ -259,14 +259,14 @@ release_packages() { find "${WORKDIR}/staging" -type d -exec chmod 755 {} + local file_list="$(mktemp -t ${0##*/}.XXXXXXXXXX)" - trap "$(printf 'rm -f -- %q' "$file_list")" EXIT + trap "rm -f -- ${file_list@Q}" EXIT list0_files > "$file_list" lock_close 8 msg "%s to upload" "$(cd "${WORKDIR}/staging" && du -hc --files0-from="$file_list" | sed -n '$s/\t.*//p')" msg "Uploading packages..." - xargs -0r -a "$file_list" dirname -z | ssh ${REPODEST_port:+-p "$REPODEST_port"} "${REPODEST_userhost}" "$(printf 'mkdir -p -- %q && cd %q && xargs -0r mkdir -pv --' "${REPODEST_path}"{,})" + xargs -0r -a "$file_list" dirname -z | ssh ${REPODEST_port:+-p "$REPODEST_port"} "${REPODEST_userhost}" "mkdir -p -- ${REPODEST_path@Q} && cd ${REPODEST_path@Q} && xargs -0r mkdir -pv --" if ! rsync ${dryrun} "${rsync_flags[@]}" \ -e "ssh ${REPODEST_port:+-p $REPODEST_port}" \ -0 --files-from="$file_list" \ @@ -284,7 +284,7 @@ release_packages() { fi msg "Running db-update on repos" - ssh ${REPODEST_port:+-p "$REPODEST_port"} "${REPODEST_userhost}" "$(printf 'STAGING=%q db-update' "$REPODEST_path")" + ssh ${REPODEST_port:+-p "$REPODEST_port"} "${REPODEST_userhost}" "STAGING=${REPODEST_path@Q} db-update" if [[ -n $HOOKPOSTRELEASE ]]; then msg "Running HOOKPOSTRELEASE..." -- cgit v1.2.2