Skip to content

Commit

Permalink
Improve bastille.conf handling with user prompt for creation
Browse files Browse the repository at this point in the history
Replaced ineffective default configuration generation logic with a user-interactive prompt. Users can now choose to create the configuration file with default values if it is missing, ensuring better control and clarity. Removed redundant code from the setup script to streamline execution.
  • Loading branch information
jdhg-orbiware committed Dec 29, 2024
1 parent cc78213 commit 0d5b92c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
14 changes: 12 additions & 2 deletions usr/local/bin/bastille
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,20 @@ PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin

. /usr/local/share/bastille/common.sh

## check for config existance
## check for config existence
bastille_conf_check() {
if [ ! -r "/usr/local/etc/bastille/bastille.conf" ]; then
error_exit "Missing Configuration"
warn "Configuration file not found. Do yu want to create it with default values? [y/N]"
read answer
case "${answer}" in
[Nn][Oo]|[Nn]|"")
error_exit "No configuration file has been generated. Exiting."
;;
[Yy][Ee][Ss]|[Yy])
cp /usr/local/etc/bastille/bastille.conf.sample /usr/local/etc/bastille/bastille.conf
info "Configuration file has been generated. Continuing with default values"
;;
esac
fi
}

Expand Down
7 changes: 0 additions & 7 deletions usr/local/share/bastille/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,6 @@

bastille_config="/usr/local/etc/bastille/bastille.conf"
. /usr/local/share/bastille/common.sh

# TODO: This not going to take effect since Bastille checks the file
# before running this subcommand. We will need to check an strategy.
if [ ! -f "${bastille_config}" ]; then
cp /usr/local/etc/bastille/bastille.conf.sample ${bastille_config}
fi

# shellcheck source=/usr/local/etc/bastille/bastille.conf
. ${bastille_config}

Expand Down

0 comments on commit 0d5b92c

Please sign in to comment.