[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - bin/symstore.sh

[Juergen Funk (via logerrit)]

 bin/symstore.sh |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e37503aa5a45046e132127a67cf8749676bdb7ed
Author:     Juergen Funk <juergen.funk_ml at cib.de>
AuthorDate: Mon Nov 18 10:33:13 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Thu Jan 23 15:48:21 2020 +0100

    symstore.sh: use logical operators for test statements
    
    No need to spawn two subshells, test can do and/or logical ops itself.
    
    Reviewed-on: https://gerrit.libreoffice.org/83066
    Tested-by: Jenkins
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    (cherry picked from commit 7f8c9ddbbd26594bb9249cc6295d0170e4bb58e7)
    
    §§{JNKCMD:NoBuild}§§
    
    Change-Id: I2abba303383f9f0053515088d4fa32753a777a1d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87266
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

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}")"