diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-07 15:06:58 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-07 15:06:58 +0200 |
| commit | 1fc5c689ed63b2c053ed223453d22c5559c706d6 (patch) | |
| tree | c0889225d7462abe7f3168f3b268081366d9c2e3 /roll-tarballs.sh | |
| parent | f4d654e6b5e993c15a3545c8d4e8d8ef3bb12b2b (diff) | |
| parent | 6bada8f63d98128b269fb379194aead1eacbd711 (diff) | |
| download | nx-libs-1fc5c689ed63b2c053ed223453d22c5559c706d6.tar.gz nx-libs-1fc5c689ed63b2c053ed223453d22c5559c706d6.tar.bz2 nx-libs-1fc5c689ed63b2c053ed223453d22c5559c706d6.zip | |
Merge branch 'mjtrangoni-fix-shellcheck-issues' into 3.6.x
Attributes GH PR #1001: https://github.com/ArcticaProject/nx-libs/pull/1001
Diffstat (limited to 'roll-tarballs.sh')
| -rwxr-xr-x | roll-tarballs.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roll-tarballs.sh b/roll-tarballs.sh index c9af13102..a263c7218 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 - ) @@ -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" |