Skip to content

Commit

Permalink
Fix some linter warnings, part 16 (#291)
Browse files Browse the repository at this point in the history
!push monasca-persister-python
!push monasca-python
  • Loading branch information
digitalfishpond authored and matrixik committed Oct 24, 2017
1 parent 60feaae commit 3559ba8
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 7 deletions.
3 changes: 1 addition & 2 deletions monasca-persister-python/start.sh
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
@@ -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

0 comments on commit 3559ba8

Please sign in to comment.