Avoid obsolete "-o" notation
parent
0357a59d47
commit
c403aa5e31
|
@ -320,7 +320,7 @@ getPackageSource () {
|
||||||
getPackageSource_outDir=''
|
getPackageSource_outDir=''
|
||||||
for getPackageSource_i in $(ls "${getPackageSource_tempDir}")
|
for getPackageSource_i in $(ls "${getPackageSource_tempDir}")
|
||||||
do
|
do
|
||||||
if test -n "${getPackageSource_outDir}" -o -f "${getPackageSource_tempDir}/${getPackageSource_i}"
|
if test -n "${getPackageSource_outDir}" || test -f "${getPackageSource_tempDir}/${getPackageSource_i}"
|
||||||
then
|
then
|
||||||
getPackageSource_outDir=''
|
getPackageSource_outDir=''
|
||||||
break
|
break
|
||||||
|
|
|
@ -11,7 +11,7 @@ WATCHED_FILES='data/special-requirements data/supported-extensions scripts/commo
|
||||||
|
|
||||||
|
|
||||||
echo 'Checking environment'
|
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
|
then
|
||||||
echo 'Not in a TravisCI environment' >&2
|
echo 'Not in a TravisCI environment' >&2
|
||||||
exit 1
|
exit 1
|
||||||
|
|
|
@ -203,7 +203,7 @@ generateReadme () {
|
||||||
generateReadme_skip=''
|
generateReadme_skip=''
|
||||||
while IFS= read -r generateReadme_line
|
while IFS= read -r generateReadme_line
|
||||||
do
|
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
|
then
|
||||||
generateReadme_skip=''
|
generateReadme_skip=''
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue