Avoid obsolete "-o" notation

pull/2/head
Michele Locati 2018-04-12 12:13:40 +02:00
parent 0357a59d47
commit c403aa5e31
No known key found for this signature in database
GPG Key ID: 98B7CE2E7234E28B
3 changed files with 3 additions and 3 deletions

View File

@ -320,7 +320,7 @@ getPackageSource () {
getPackageSource_outDir=''
for getPackageSource_i in $(ls "${getPackageSource_tempDir}")
do
if test -n "${getPackageSource_outDir}" -o -f "${getPackageSource_tempDir}/${getPackageSource_i}"
if test -n "${getPackageSource_outDir}" || test -f "${getPackageSource_tempDir}/${getPackageSource_i}"
then
getPackageSource_outDir=''
break

View File

@ -11,7 +11,7 @@ WATCHED_FILES='data/special-requirements data/supported-extensions scripts/commo
echo 'Checking environment'
if test -z "${TRAVIS_BUILD_DIR:-}" -o -z "${TRAVIS_BRANCH:-}" -o -z "${TRAVIS_EVENT_TYPE:-}" -o -z "${TRAVIS_REPO_SLUG:-}"
if test -z "${TRAVIS_BUILD_DIR:-}" || test -z "${TRAVIS_BRANCH:-}" || test -z "${TRAVIS_EVENT_TYPE:-}" || test -z "${TRAVIS_REPO_SLUG:-}"
then
echo 'Not in a TravisCI environment' >&2
exit 1

View File

@ -203,7 +203,7 @@ generateReadme () {
generateReadme_skip=''
while IFS= read -r generateReadme_line
do
if test "${generateReadme_line}" = "${generateReadme_ph_ExtensionsEnd}" -o "${generateReadme_line}" = "${generateReadme_ph_SpecialEnd}"
if test "${generateReadme_line}" = "${generateReadme_ph_ExtensionsEnd}" || test "${generateReadme_line}" = "${generateReadme_ph_SpecialEnd}"
then
generateReadme_skip=''
fi