From 2ea45fd9fdd23b923149007751575318ca7c28d8 Mon Sep 17 00:00:00 2001 From: Martin Winkler Date: Wed, 1 Jun 2022 11:15:40 +0200 Subject: [PATCH] matterbridge - restart service after compilation --- seqs/matterbridge.sh | 1 + sequencer.sh | 33 +++++++++++++-------------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/seqs/matterbridge.sh b/seqs/matterbridge.sh index eb0303d..e136585 100755 --- a/seqs/matterbridge.sh +++ b/seqs/matterbridge.sh @@ -185,6 +185,7 @@ whatsappmulti" exe "${goDir}/bin/go" install -tags ${mabrTags} github.com/42wim/matterbridge@master step backup exe cp -ar "${HOME}/go/bin/matterbridge" "${toolDir}" + exe service ${toolName} restart >>/dev/null 2>&1 } step_32_info() { echo "Clean temporary files"; } diff --git a/sequencer.sh b/sequencer.sh index feecd60..4892f21 100755 --- a/sequencer.sh +++ b/sequencer.sh @@ -381,7 +381,6 @@ USAGE_API sqr::log () { sqr::debugPause local appendText= - local arg= local col_end="${col_off}" local outp='/dev/stdout' @@ -389,7 +388,7 @@ USAGE_API shift local log_color="${1:-}" shift - for arg in "${@}" ; do + for _ in "${@}" ; do case "${1:-}" in --) shift && break ;; @@ -553,9 +552,8 @@ running() { # -f : a function exists() { local func= - local arg= - for arg in "$@" ; do + for _ in "$@" ; do case "${1:-}" in --) shift && break ;; @@ -619,13 +617,12 @@ editor() { # -- : end of options confirm() { sqr::debugPause - local arg= local rexReply='^[Yy]+$' # default no local inputHelp='[y/N] ' # default no local noHelp=0 local force=0 - for arg in "${@}" ; do + for _ in "${@}" ; do case "${1:-}" in --) shift && break ;; @@ -668,9 +665,8 @@ ask() { sqr::debugPause local hidden= local empty=0 - local arg= - for arg in "$@" ; do - case "${1}" in + for _ in "$@" ; do + case "${1:-}" in --) shift && break ;; -e) @@ -726,13 +722,12 @@ getReturn() { # [MESSAGE] : Custom error message # endReturn() { - local arg local forceExit=0 local errorCode=${_sqr_errno} local endMessage="" - for arg in "$@" ; do - case "$1" in + for _ in "$@" ; do + case "${1:-}" in -f) forceExit=1 shift @@ -813,11 +808,10 @@ endIfEmpty() { # if all fails, a log file is created with the conflicts to be resolved by the user addConf() { local addConfBackup= - local arg local confMode="" local transferCmd="echo" - for arg in "$@" ; do + for _ in "$@" ; do case "${1:-}" in -c) # create a new file confMode="-c" @@ -933,7 +927,7 @@ checkStep() { else checkStep_ref=0 fi - + # Catch special character after evaluation if ! [[ "${checkStep_ref}" =~ ${checkStep_rex} ]] ; then checkStep_ref=0 @@ -1168,7 +1162,6 @@ showVersion() { # 2 : Created empty configuration # 3 : No configuration created initSeqConfig() { - local arg local answer=n local retVal=255 local sourceAlways=0 @@ -1176,8 +1169,8 @@ initSeqConfig() { local seqProfiles=0 local configExists= local configDir= - for arg in "$@" ; do - case "$1" in + for _ in "$@" ; do + case "${1:-}" in -e) createEmpty=1 shift ;; @@ -1448,7 +1441,7 @@ sqr::compatible() { # exclude older versions if needed if [ -n "${sqr_minVersion}" ] && [[ ${sqr_minVersion} -le 15 ]] ; then error "Unsupported sequence revision (major changes in version 16)" - error -a "(Use 'sequpgrade.sh $(readlink -f -- $0)' for a basic upgrade)" + error -a "(Use 'sequpgrade.sh $(readlink -f -- "$0")' for a basic upgrade)" showVersion return 1 fi @@ -1469,7 +1462,7 @@ sqr::main() { local startAll= # options check - for arg in "$@" ; do + for _ in "$@" ; do case "${1:-}" in ++) # end parameter and quickstart step 1 with -qq quickStartOne=1