X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fpackage-listing.sh;h=c0b5476ca35e8f31c17f53d0711d5ace9cbd3ec4;hb=refs%2Fchanges%2F50%2F72650%2F2;hp=37603259aa83512e9b9f3555bf5ad0f51b9655d7;hpb=8709ee5e00526ce3298b92a85a79a7f058d4216b;p=releng%2Fglobal-jjb.git diff --git a/shell/package-listing.sh b/shell/package-listing.sh index 37603259..c0b5476c 100755 --- a/shell/package-listing.sh +++ b/shell/package-listing.sh @@ -28,8 +28,7 @@ DIFF_PACKAGES=/tmp/packages_diff.txt # Swap to creating END_PACKAGES if we are running in a CI job (determined by if # we have a workspace env) or if the starting packages listing already exists. PACKAGES="${START_PACKAGES}" -if [ "${workspace}" ] || [ -f "${START_PACKAGES}" ] -then +if [ "${workspace}" ] || [ -f "${START_PACKAGES}" ]; then PACKAGES="${END_PACKAGES}" fi @@ -47,16 +46,14 @@ case "${OS_FAMILY}" in ;; esac -if [ -f "${START_PACKAGES}" ] && [ -f "${END_PACKAGES}" ] -then +if [ -f "${START_PACKAGES}" ] && [ -f "${END_PACKAGES}" ]; then # ` || true` Ignore exit code because diff exits 1 when there is a diff diff "${START_PACKAGES}" "${END_PACKAGES}" > "${DIFF_PACKAGES}" || true fi # If running in a Jenkins job, then copy the created files to the archives # location -if [ "${workspace}" ] -then +if [ "${workspace}" ]; then mkdir -p "${workspace}/archives/" cp -f /tmp/packages_*.txt "${workspace}/archives/" fi