diff options
| author | Juergen Funk <juergen.funk_ml@cib.de> | 2019-11-18 10:33:13 +0100 |
|---|---|---|
| committer | Juergen Funk (CIB) <juergen.funk_ml@cib.de> | 2019-12-19 10:52:27 +0100 |
| commit | 603bb1fcd02fd931046a92c83381afcfd5972257 (patch) | |
| tree | 74c9767231c487cdc3248261a98dae23a832f29f /bin | |
| parent | 968daf12db7b882e01ef6e4d2e94faf18a5af74e (diff) | |
symstore.sh: use logical operators for test statements
No need to spawn two subshells, test can do and/or logical ops itself.
Change-Id: I2abba303383f9f0053515088d4fa32753a777a1d
Reviewed-on: https://gerrit.libreoffice.org/83066
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 7f8c9ddbbd26594bb9249cc6295d0170e4bb58e7)
Reviewed-on: https://gerrit.libreoffice.org/85381
Reviewed-by: Juergen Funk (CIB) <juergen.funk_ml@cib.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/symstore.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/symstore.sh b/bin/symstore.sh index f37ea0f4e7a0..2f7ad2f77610 100755 --- a/bin/symstore.sh +++ b/bin/symstore.sh @@ -20,11 +20,11 @@ add_pdb() } # check preconditions -if [ -z "${INSTDIR}" ] || [ -z "${WORKDIR}" ]; then +if [ -z "${INSTDIR}" -o -z "${WORKDIR}" ]; then echo "INSTDIR or WORKDIR not set - script expects calling inside buildenv" exit 1 fi -if [ ! -d "${INSTDIR}" ] || [ ! -d "${WORKDIR}" ]; then +if [ ! -d "${INSTDIR}" -o ! -d "${WORKDIR}" ]; then echo "INSTDIR or WORKDIR not present - script expects calling after full build" exit 1 fi @@ -84,7 +84,7 @@ rm -f "${TMPFILE}" # Cleanup symstore, older revisions will be removed. Unless the # .dll/.exe changes, the .pdb should be shared, so with incremental # tinderbox several revisions should not be that space-demanding. -if [ "${MAX_KEEP}" -gt 0 ] && [ -d "${SYM_PATH}/000Admin" ]; then +if [ "${MAX_KEEP}" -gt 0 -a -d "${SYM_PATH}/000Admin" ]; then to_remove=$(ls -1 "${SYM_PATH}/000Admin" | grep -v '\.txt' | grep -v '\.deleted' | sort | head -n "-${MAX_KEEP}") for revision in $to_remove; do symstore.exe del /i "${revision}" /s "$(cygpath -w "${SYM_PATH}")" |