From f608b73a291acdb3bef68229a72342f7c99fe092 Mon Sep 17 00:00:00 2001 From: Sean Bright Date: Wed, 3 Oct 2018 10:05:55 -0400 Subject: [PATCH] CI: Use brace expansion instead of calling out to seq Also make the shebang in publishAsteriskDocs.sh the first line. Change-Id: I3fdd6f22e652e4fb5b5fe85df46fa34eb6d0cf08 --- tests/CI/publishAsteriskDocs.sh | 4 ++-- tests/CI/runUnittests.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/CI/publishAsteriskDocs.sh b/tests/CI/publishAsteriskDocs.sh index d5c857a70d..dc59033faa 100755 --- a/tests/CI/publishAsteriskDocs.sh +++ b/tests/CI/publishAsteriskDocs.sh @@ -1,7 +1,7 @@ +#!/usr/bin/env bash # # Publish Asterisk documentation to the wiki # -#!/usr/bin/env bash CIDIR=$(dirname $(readlink -fn $0)) source $CIDIR/ci.functions ASTETCDIR=$DESTDIR/etc/asterisk @@ -113,7 +113,7 @@ ${OUTPUTDIR}/publish-rest-api.py --username="${CONFLUENCE_USER}" \ rm -f ${OUTPUTDIR}/full-en_US.xml sudo $ASTERISK ${USER_GROUP:+-U ${USER_GROUP%%:*} -G ${USER_GROUP##*:}} -gn -C $CONFFILE -for n in `seq 1 5` ; do +for n in {1..5} ; do sleep 3 $ASTERISK -rx "core waitfullybooted" -C $CONFFILE && break done diff --git a/tests/CI/runUnittests.sh b/tests/CI/runUnittests.sh index 1d2656b176..d4513621a9 100755 --- a/tests/CI/runUnittests.sh +++ b/tests/CI/runUnittests.sh @@ -55,7 +55,7 @@ rm -rf $ASTETCDIR/extensions.{ael,lua} || : set -x sudo $ASTERISK ${USER_GROUP:+-U ${USER_GROUP%%:*} -G ${USER_GROUP##*:}} -gn -C $CONFFILE -for n in `seq 1 5` ; do +for n in {1..5} ; do sleep 3 $ASTERISK -rx "core waitfullybooted" -C $CONFFILE && break done -- 2.47.2