From c35bd3aa8e73a6a666a7afda42a0a9d6a20ef1a3 Mon Sep 17 00:00:00 2001 From: Michal Hrusecky Date: Fri, 2 Oct 2020 10:34:21 +0200 Subject: [PATCH] mariadb: Add shellcheck disable into init script On few places, shellcheck gets confused by how some OpenWrt functions work - especially load ones. Also on few places there are $options variables that need not to be globbed. Could be rewritten better not to need them, but I'll do major rewrites later in separate pull request. Signed-off-by: Michal Hrusecky --- utils/mariadb/files/mysqld.init | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/utils/mariadb/files/mysqld.init b/utils/mariadb/files/mysqld.init index 54fe53389e..3e35389073 100644 --- a/utils/mariadb/files/mysqld.init +++ b/utils/mariadb/files/mysqld.init @@ -1,7 +1,9 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2010-2018 OpenWrt.org +# shellcheck disable=SC2034 START=95 +# shellcheck disable=SC2034 STOP=10 NAME=mysqld @@ -78,6 +80,7 @@ start() { config_load "$NAME" config_get_bool enabled general enabled 0 + # shellcheck disable=SC2154 if [ "$enabled" -eq 0 ]; then $LOGGER "service not enabled in /etc/config/$NAME" exit 1 @@ -123,11 +126,12 @@ start() { if [ "$i" = "$rundir" ]; then opts= fi + # shellcheck disable=SC2086 mkdir -p $opts "$i" [ -d "$i" ] && chown mariadb:mariadb "$i" fi done - + # shellcheck disable=SC2154,SC2086 "$MYSQLDSAFE" $options >/dev/null 2>&1 & fi } -- 2.30.2