Skip to content

Fix some linter warnings, part 16 #291

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matrixik merged 2 commits into from
Oct 24, 2017
Merged

Fix some linter warnings, part 16 #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df88ccf
Fix some linter warnings, part 16
digitalfishpond Oct 24, 2017
c596c33
Merge branch 'master' into fix-lint-16
digitalfishpond Oct 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions monasca-persister-python/start.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ if [ -n "$KAFKA_WAIT_FOR_TOPICS" ]; then
success="false"

for i in $(seq "$KAFKA_WAIT_RETRIES"); do
python /kafka_wait_for_topics.py
if [ $? -eq 0 ]; then
if python /kafka_wait_for_topics.py; then
success="true"
break
else
Expand Down
14 changes: 9 additions & 5 deletions monasca-python/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
#!/bin/sh
# shellcheck shell=dash

set -x

if [ -e /apk.sh ]; then
echo "Overriding default apk dependencies install function"
source /apk.sh
# shellcheck disable=SC1091
. /apk.sh
else
echo "Using default apk dependencies install function"
install_apk_deps() {
Expand All @@ -14,7 +16,8 @@ fi

if [ -e /install.sh ]; then
echo "Overriding default install function"
source /install.sh
# shellcheck disable=SC1091
. /install.sh
else
echo "Using default install function"
install() {
Expand Down Expand Up @@ -45,7 +48,8 @@ fi

if [ -e /clone.sh ]; then
echo "Overriding default clone function"
source /clone.sh
# shellcheck disable=SC1091
. /clone.sh
else
echo "Using default clone function"
clone() {
Expand All @@ -69,8 +73,8 @@ CONSTRAINTS=""
CONSTRAINTS_URL=""
CONSTRAINTS_BRANCH=""

OPTS=`getopt -n 'parse-options' -o r:b:e:d:c:u:q: -- "$@"`
if [ $? != 0 ] ; then echo "Failed parsing options." >&2 ; exit 1 ; fi
if OPTS=$(getopt -n 'parse-options' -o r:b:e:d:c:u:q: -- "$@"); then
echo "Failed parsing options." >&2 ; exit 1 ; fi

echo "$OPTS"
eval set -- "$OPTS"
Expand Down