diff --git a/daily.sh b/daily.sh index f876c98978..56e6d1b1d1 100755 --- a/daily.sh +++ b/daily.sh @@ -30,7 +30,7 @@ COMPOSER="php ${LIBRENMS_DIR}/scripts/composer_wrapper.php --no-interaction" LOG_DIR=$(php -r "@include '${LIBRENMS_DIR}/config.php'; echo isset(\$config['log_dir']) ? \$config['log_dir'] : '${LIBRENMS_DIR}/logs';") # get the librenms user -# shellcheck source=/opt/librenms/.env +# shellcheck source=.env.example source "${LIBRENMS_DIR}/.env" LIBRENMS_USER="${LIBRENMS_USER:-librenms}" LIBRENMS_USER_ID=$(id -u "$LIBRENMS_USER") @@ -74,7 +74,7 @@ status_run() { if [[ "${arg_option}" == "update" ]]; then php "${LIBRENMS_DIR}/daily.php" -f notify -o "${tmp}" fi - if [[ ! -z "${tmp}" ]]; then + if [[ -n "${tmp}" ]]; then # print output in case of failure echo "${tmp}" fi diff --git a/misc/lnms-completion.bash b/misc/lnms-completion.bash index 16a93c8039..3d07bed289 100644 --- a/misc/lnms-completion.bash +++ b/misc/lnms-completion.bash @@ -1,7 +1,8 @@ #!/usr/bin/env bash _lnms_completion() { - COMPREPLY=(`COMP_CURRENT="${2}" COMP_PREVIOUS="${3}" COMP_LINE="${COMP_LINE}" lnms list:bash-completion`) + #shellcheck disable=SC2207 + COMPREPLY=($(COMP_CURRENT="${2}" COMP_PREVIOUS="${3}" COMP_LINE="${COMP_LINE}" lnms list:bash-completion)) return $? } complete -F _lnms_completion lnms diff --git a/scripts/github-apply b/scripts/github-apply index 5c2d67a579..d4246606fa 100755 --- a/scripts/github-apply +++ b/scripts/github-apply @@ -1,9 +1,9 @@ #!/bin/sh -LIBRENMS_DIR=`dirname "$(readlink -f "$0/..")"` -cd $LIBRENMS_DIR +LIBRENMS_DIR=$(dirname "$(readlink -f "$0/..")") +cd "$LIBRENMS_DIR" || exit case $1 in ''|*[!0-9]*) echo "You must specify a PR number to apply a patch" ;; - *) curl -s https://patch-diff.githubusercontent.com/raw/librenms/librenms/pull/${1}.diff | git apply --exclude=*.png -v ${2} ;; + *) curl -s https://patch-diff.githubusercontent.com/raw/librenms/librenms/pull/"${1}".diff | git apply --exclude=*.png -v ;; esac