From 14770b1dae2b309907bc6c6129e38c88f4cee51d Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Apr 07 2025 21:06:03 +0000 Subject: Fix ShellCheck warnings for rpmdev-newinit.in and template.init --- diff --git a/rpmdev-newinit.in b/rpmdev-newinit.in index 1ad7e33..9a7647f 100644 --- a/rpmdev-newinit.in +++ b/rpmdev-newinit.in @@ -62,16 +62,14 @@ EOF appname= output= -output_set= while [[ $1 ]] ; do case $1 in -o|--output) shift output="$1" - output_set=1 case $output in - *.init) [[ -z $appname ]] && appname="$(basename $1 .init)" ;; + *.init) [[ -z $appname ]] && appname="$(basename "$1" .init)" ;; esac ;; -h|--help) @@ -84,7 +82,7 @@ while [[ $1 ]] ; do ;; *.init) [[ -z $output ]] && output="$1" - appname="$(basename $1 .init)" + appname="$(basename "$1" .init)" ;; *) appname="$1" diff --git a/template.init b/template.init index 181c1db..92c3707 100644 --- a/template.init +++ b/template.init @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # APPNAME - # @@ -20,30 +20,34 @@ ### END INIT INFO # Source function library. +# shellcheck disable=SC1091 . /etc/rc.d/init.d/functions exec="/usr/sbin/APPNAME" prog=${exec##*/} -[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog +# shellcheck disable=SC1090 +[ -e "/etc/sysconfig/$prog" ] && . "/etc/sysconfig/$prog" -lockfile=/var/lock/subsys/$prog +lockfile="/var/lock/subsys/$prog" start() { echo -n $"Starting $prog: " # if not running, start it up here, usually something like "daemon $exec" + # shellcheck disable=SC2320 retval=$? echo - [ $retval -eq 0 ] && touch $lockfile + [ $retval -eq 0 ] && touch "$lockfile" return $retval } stop() { echo -n $"Stopping $prog: " # stop it here, often "killproc $prog" + # shellcheck disable=SC2320 retval=$? echo - [ $retval -eq 0 ] && rm -f $lockfile + [ $retval -eq 0 ] && rm -f "$lockfile" return $retval } @@ -60,10 +64,10 @@ case "$1" in restart ;; status) - status $prog + status "$prog" ;; try-restart|condrestart) - if status $prog >/dev/null ; then + if status "$prog" >/dev/null ; then restart fi ;;