isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use the POSIX shell "command -v" instead of "which" to find programs.

Browse Source 
Fix false detection of init.d/service status.
This commit is contained in:
Todd C. Miller
2022-12-27 12:28:53 -07:00
parent 519a005802
commit adf2a432af
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/pp
View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright 2021 One Identity LLC. ALL RIGHTS RESERVED # Copyright 2022 One Identity LLC. ALL RIGHTS RESERVED
pp_revision="20211119" pp_revision="20221227"
# Copyright 2018 One Identity LLC. ALL RIGHTS RESERVED. # Copyright 2018 One Identity LLC. ALL RIGHTS RESERVED.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@@ -3937,7 +3937,7 @@ pp_deb_check_required_programs () {
needed= notfound= needed= notfound=
for prog in dpkg dpkg-deb install md5sum fakeroot for prog in dpkg dpkg-deb install md5sum fakeroot
do do
if which $prog 2>/dev/null >/dev/null; then if command -v $prog 2>/dev/null >/dev/null; then
pp_debug "$prog: found" pp_debug "$prog: found"
else else
pp_debug "$prog: not found" pp_debug "$prog: not found"
@@ -5600,7 +5600,7 @@ pp_rpm_detect_distro () {
pp_rpm_detect_rpmbuild () { pp_rpm_detect_rpmbuild () {
local cmd local cmd
for cmd in rpmbuild rpm; do for cmd in rpmbuild rpm; do
if `which $cmd > /dev/null 2>&1`; then if command -v $cmd > /dev/null 2>&1; then
echo $cmd echo $cmd
return 0 return 0
fi fi
@@ -7999,7 +7999,7 @@ pp_bsd_check_required_programs () {
# list of programs FreeBSD needs in order to create a binary package # list of programs FreeBSD needs in order to create a binary package
for prog in ${pp_bsd_required_programs:-"pkg"} for prog in ${pp_bsd_required_programs:-"pkg"}
do do
if which $prog 2>&1 > /dev/null; then if command -v $prog 2>&1 > /dev/null; then
pp_debug "$prog: found" pp_debug "$prog: found"
else else
pp_debug "$prog: not found" pp_debug "$prog: not found"
@@ -8960,10 +8960,18 @@ pp_systemd_service_install_common () {
# we do this so we do not "orphan" the process. Because init started it and if we enable systemd # we do this so we do not "orphan" the process. Because init started it and if we enable systemd
# it will not know about this process and will not be able to stop it. # it will not know about this process and will not be able to stop it.
if [ -x "/etc/init.d/$svc" ]; then if [ -x "/etc/init.d/$svc" ]; then
/etc/init.d/$svc status > /dev/null 2>&1 output="$(/etc/init.d/$svc status 2>&1)"
RUNNING=$? RUNNING=$?
if [ $RUNNING -eq 0 ]; then if [ $RUNNING -eq 0 ]; then
/etc/init.d/$svc stop > /dev/null 2>&1 case "$output" in
*"not running"*)
# systemd is reporting the status (compatibility package is installed)
RUNNING=1
;;
*) # it is really running
/etc/init.d/$svc stop > /dev/null 2>&1
;;
esac
fi fi
else else
RUNNING=1 RUNNING=1