Fix unbound variable

- Run messages preceded by INFO;
- Comment unknown unused variables;
- Remove unnecessary variables; and
- Deal with unbound variable due to subshell by writing to a file;
This commit is contained in:
Ben Grande 2024-01-02 17:08:45 +01:00
parent abf72c2ee4
commit bc02c72018
No known key found for this signature in database
GPG Key ID: 00C64E14F51F9E56

View File

@ -14,17 +14,17 @@ dpkg_admindir_parameter_existing_mode="--admindir ${store_dir}/existing_mode"
dpkg_admindir_parameter_new_mode="--admindir ${store_dir}/new_mode" dpkg_admindir_parameter_new_mode="--admindir ${store_dir}/new_mode"
echo_wrapper_ignore() { echo_wrapper_ignore() {
echo "run: $*" echo "INFO: run: $*"
"$@" 2>/dev/null || true "$@" 2>/dev/null || true
} }
echo_wrapper_silent_ignore() { echo_wrapper_silent_ignore() {
#echo "run: $@" #echo "INFO: run: $@"
"$@" 2>/dev/null || true "$@" 2>/dev/null || true
} }
echo_wrapper_audit() { echo_wrapper_audit() {
echo "run: $*" echo "INFO: run: $*"
return_code=0 return_code=0
"$@" || "$@" ||
{ {
@ -499,8 +499,8 @@ parse_config_folder() {
group_file_contents_temp=$(getent group) group_file_contents_temp=$(getent group)
echo "${group_file_contents_temp}" | tee "${store_dir}/private/group" >/dev/null echo "${group_file_contents_temp}" | tee "${store_dir}/private/group" >/dev/null
passwd_file_contents="$(cat "${store_dir}/private/passwd")" #passwd_file_contents="$(cat "${store_dir}/private/passwd")"
group_file_contents="$(cat "${store_dir}/private/group")" #group_file_contents="$(cat "${store_dir}/private/group")"
shopt -s nullglob shopt -s nullglob
for config_file in \ for config_file in \
@ -555,32 +555,29 @@ spare() {
true "owner: '${owner}' group: '${group}' mode: '${mode}' file_name: '${file_name}'" true "owner: '${owner}' group: '${group}' mode: '${mode}' file_name: '${file_name}'"
if test "${remove_file}" = "all"; then if test "${remove_file}" = "all"; then
proceed=true
verbose="" verbose=""
remove_one=false remove_one=false
else else
if test "${remove_file}" = "${file_name}"; then if test "${remove_file}" = "${file_name}"; then
proceed=true
verbose="--verbose" verbose="--verbose"
remove_one=true remove_one=true
echo "${remove_one}" | tee "${store_dir}/remove_one" >/dev/null
else else
proceed=false echo "false" | tee "${store_dir}/remove_one" >/dev/null
verbose="" continue
fi fi
fi fi
if test "${proceed}" = "false"; then
continue
fi
if test "${remove_one}" = "true"; then if test "${remove_one}" = "true"; then
set -o xtrace set -o xtrace
fi fi
if test -e "${file_name}"; then if test -e "${file_name}"; then
# shellcheck disable=SC2086
chown ${verbose} "${owner}:${group}" "${file_name}" || exit_code=202 chown ${verbose} "${owner}:${group}" "${file_name}" || exit_code=202
## chmod need to be run after chown since chown removes suid. ## chmod need to be run after chown since chown removes suid.
## https://unix.stackexchange.com/questions/53665/chown-removes-setuid-bit-bug-or-feature ## https://unix.stackexchange.com/questions/53665/chown-removes-setuid-bit-bug-or-feature
# shellcheck disable=SC2086
chmod ${verbose} "${mode}" "${file_name}" || exit_code=203 chmod ${verbose} "${mode}" "${file_name}" || exit_code=203
else else
echo "INFO: file_name: '${file_name}' - does not exist. This is likely normal." echo "INFO: file_name: '${file_name}' - does not exist. This is likely normal."
@ -600,10 +597,10 @@ spare() {
done < "${store_dir}/existing_mode/statoverride" done < "${store_dir}/existing_mode/statoverride"
if test ! "${remove_file}" = "all"; then if test ! "${remove_file}" = "all"; then
if test ! "${remove_one}" = "true"; then if test "$(cat "${store_dir}/remove_one")" = "false"; then
echo "INFO: no file removed. echo "INFO: no file was removed.
File '${remove_file}' has not removed from SUID Disabler and Permission Hardener during this invocation of this program. File '${remove_file}' has not been removed from SUID Disabler and Permission Hardener during this invocation of this program.
Note: This is expected if already done earlier. Note: This is expected if already done earlier.
@ -657,7 +654,7 @@ case "${1:-}" in
disable) disable)
shift shift
case "${1:-}" in case "${1:-}" in
"") usage;; "") usage 1;;
*) spare "${1}";; *) spare "${1}";;
esac esac
;; ;;