mirror of
https://github.com/hackacad/bastille.git
synced 2025-12-19 08:40:44 +01:00
Load config after setting BASTILLE_CONFIG
This commit is contained in:
@@ -31,7 +31,6 @@
|
|||||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
|
PATH=${PATH}:/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
|
||||||
. /usr/local/share/bastille/common.sh
|
|
||||||
|
|
||||||
## check for config existence
|
## check for config existence
|
||||||
bastille_conf_check() {
|
bastille_conf_check() {
|
||||||
@@ -131,6 +130,9 @@ if [ -z "${BASTILLE_CONFIG}" ]; then
|
|||||||
export BASTILLE_CONFIG
|
export BASTILLE_CONFIG
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Load common.sh after setting BASTILLE_CONFIG
|
||||||
|
. /usr/local/share/bastille/common.sh
|
||||||
|
|
||||||
# Handle options
|
# Handle options
|
||||||
while [ "$#" -gt 0 ]; do
|
while [ "$#" -gt 0 ]; do
|
||||||
case "${1}" in
|
case "${1}" in
|
||||||
|
|||||||
Reference in New Issue
Block a user