From dfee5a9886112b29f14f762016c8fe892846bfef Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Sat, 6 Feb 2021 17:56:53 +0100 Subject: shellcheck: Fix SC2064 issues For more information: https://www.shellcheck.net/wiki/SC2064 -- Use single quotes, otherwise this... Signed-off-by: Mario Trangoni --- roll-tarballs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roll-tarballs.sh') diff --git a/roll-tarballs.sh b/roll-tarballs.sh index c9af13102..95b820c5a 100755 --- a/roll-tarballs.sh +++ b/roll-tarballs.sh @@ -68,7 +68,7 @@ TARGETDIR="../.." MANIFEST="$(mktemp)" TEMP_DIR="$(mktemp -d)" -trap "rm -f \"${MANIFEST}\"; rm -rf \"${TEMP_DIR}\"" 0 +trap 'rm -f "${MANIFEST}"; rm -rf "${TEMP_DIR}"' 0 # create local copy of Git project at temp location git archive --format=tar "${CHECKOUT}" --prefix="${PROJECT}-${RELEASE}/" | ( cd "$TEMP_DIR"; tar xf - ) -- cgit v1.2.3 From 71ae04011c353b0341b5ab0c16dad12ebefe6a67 Mon Sep 17 00:00:00 2001 From: Mario Trangoni Date: Sat, 6 Feb 2021 17:58:47 +0100 Subject: shellcheck: Fix SC2022 issue $ find . -name "*.sh" | xargs shellcheck -i SC2022 In ./roll-tarballs.sh line 120: ls -d nx-X11/extras/* | grep -v "nx-X11/extras/tmpMesa*" | xargs rm -r ^----------------------^ SC2022: Note that unlike globs, a* here matches 'aaa' but not 'alpha'. For more information: https://www.shellcheck.net/wiki/SC2022 -- Note that unlike globs, a* here m... Signed-off-by: Mario Trangoni --- roll-tarballs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roll-tarballs.sh') diff --git a/roll-tarballs.sh b/roll-tarballs.sh index 95b820c5a..a263c7218 100755 --- a/roll-tarballs.sh +++ b/roll-tarballs.sh @@ -117,7 +117,7 @@ if [ "x$MODE" = "xfull" ]; then # nx-X11/extras/Mesa. Deal with the Mesa.patches symlink/folder accordingly cp -Lr "nx-X11/extras/Mesa" "nx-X11/extras/tmpMesa" cp -Lr "nx-X11/extras/Mesa.patches" "nx-X11/extras/tmpMesa.patches" - ls -d nx-X11/extras/* | grep -v "nx-X11/extras/tmpMesa*" | xargs rm -r + ls -d nx-X11/extras/* | grep -v "^nx-X11/extras/tmpMesa*" | xargs rm -r mv "nx-X11/extras/tmpMesa" "nx-X11/extras/Mesa" mv "nx-X11/extras/tmpMesa.patches" "nx-X11/extras/Mesa.patches" -- cgit v1.2.3