diff options
| -rwxr-xr-x | nx-X11/x-indent.sh | 2 | ||||
| -rwxr-xr-x | regenerate-symbol-docs.sh | 20 | ||||
| -rwxr-xr-x | roll-tarballs.sh | 4 |
3 files changed, 13 insertions, 13 deletions
diff --git a/nx-X11/x-indent.sh b/nx-X11/x-indent.sh index 327aa6a4f..4690372e6 100755 --- a/nx-X11/x-indent.sh +++ b/nx-X11/x-indent.sh @@ -2,7 +2,7 @@ # We want GNU indent, so first search for gindent to avoid /usr/bin/indent # on the BSDs, which won't work for us -INDENT=$(which gnuindent || which gindent || which indent) +INDENT=$(command -v gnuindent || command -v gindent || command -v indent) if [ -z "${INDENT}" ] ; then echo "Could not find indent, sorry..." >&2 diff --git a/regenerate-symbol-docs.sh b/regenerate-symbol-docs.sh index 05548bdb0..90bc9da34 100755 --- a/regenerate-symbol-docs.sh +++ b/regenerate-symbol-docs.sh @@ -23,7 +23,7 @@ SYMBOLS_FILE="doc/libNX_X11/symbols/libNX_X11::symbols.txt" DOC_FILE="doc/libNX_X11/symbols/libNX_X11::symbol-usage_internally.txt" echo "Scanning for libNX_X11 symbols: in libNX_X11 internally: $DOC_FILE" -cd nx-X11/lib/X11/ +cd nx-X11/lib/X11/ || exit grep -v -E "^#" "../../../$SYMBOLS_FILE" | while read -r symbol; do echo @@ -31,11 +31,11 @@ grep -v -E "^#" "../../../$SYMBOLS_FILE" | while read -r symbol; do grep -n "$symbol" *.{c,h} 2>/dev/null done > "../../../$DOC_FILE" -cd - 1>/dev/null +cd - 1>/dev/null || exit DOC_FILE="doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxagent.txt" echo "Scanning for libNX_X11 symbols: in hw/nxagent: $DOC_FILE" -cd nx-X11/programs/Xserver/hw/nxagent/ +cd nx-X11/programs/Xserver/hw/nxagent/ || exit grep -v -E "^#" "../../../../../$SYMBOLS_FILE" | while read -r symbol; do echo @@ -43,11 +43,11 @@ grep -v -E "^#" "../../../../../$SYMBOLS_FILE" | while read -r symbol; do grep -n "$symbol" *.{c,h} 2>/dev/null done > "../../../../../$DOC_FILE" -cd - 1>/dev/null +cd - 1>/dev/null || exit DOC_FILE="doc/libNX_X11/symbols/libNX_X11::symbol-usage_nxcompext.txt" echo "Scanning for libNX_X11 symbols: in hw/nxagent/compext: $DOC_FILE" -cd nx-X11/programs/Xserver/hw/nxagent/compext/ +cd nx-X11/programs/Xserver/hw/nxagent/compext/ || exit grep -v -E "^#" "../../../../../../$SYMBOLS_FILE" | while read -r symbol; do echo @@ -55,7 +55,7 @@ grep -v -E "^#" "../../../../../../$SYMBOLS_FILE" | while read -r symbol; do grep -n "$symbol" *.{c,h} 2>/dev/null done > "../../../../../../$DOC_FILE" -cd - 1>/dev/null +cd - 1>/dev/null || exit # nxcompext @@ -64,7 +64,7 @@ SYMBOLS_FILE="doc/nxcompext/symbols/nxcompext::symbols.txt" DOC_FILE="doc/nxcompext/symbols/nxcompext::symbol-usage_internally.txt" echo "Scanning for nxcompext symbols: in hw/nxagent/compext internally: $DOC_FILE" -cd nx-X11/programs/Xserver/hw/nxagent/compext/ +cd nx-X11/programs/Xserver/hw/nxagent/compext/ || exit grep -v -E "^#" "../../../../../../$SYMBOLS_FILE" | while read -r symbol; do echo @@ -72,11 +72,11 @@ grep -v -E "^#" "../../../../../../$SYMBOLS_FILE" | while read -r symbol; do grep -n "$symbol" *.{c,h} 2>/dev/null done > "../../../../../../$DOC_FILE" -cd - 1>/dev/null +cd - 1>/dev/null || exit DOC_FILE="doc/nxcompext/symbols/nxcompext::symbol-usage_nxagent.txt" echo "Scanning for nxcompext symbols: in hw/nxagent: $DOC_FILE" -cd nx-X11/programs/Xserver/hw/nxagent/ +cd nx-X11/programs/Xserver/hw/nxagent/ || exit grep -v -E "^#" "../../../../../$SYMBOLS_FILE" | while read -r symbol; do echo @@ -84,4 +84,4 @@ grep -v -E "^#" "../../../../../$SYMBOLS_FILE" | while read -r symbol; do grep -n "$symbol" *.{c,h} 2>/dev/null done > "../../../../../$DOC_FILE" -cd - 1>/dev/null +cd - 1>/dev/null || exit 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" |