mirror of
https://github.com/hackacad/bastille.git
synced 2026-01-04 03:33:41 +01:00
bastille: Load config only from commons.sh
Since all files source common.sh anyway, we don't want to source the config twice.
This commit is contained in:
@@ -30,6 +30,11 @@
|
||||
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
# Load config. This only has to be done here
|
||||
# becasue all commands load this file
|
||||
# shellcheck disable=SC1090
|
||||
. ${BASTILLE_CONFIG}
|
||||
|
||||
COLOR_RED=
|
||||
COLOR_GREEN=
|
||||
COLOR_YELLOW=
|
||||
@@ -43,14 +48,6 @@ bastille_root_check() {
|
||||
fi
|
||||
}
|
||||
|
||||
load_config() {
|
||||
# shellcheck disable=SC1090
|
||||
. ${BASTILLE_CONFIG}
|
||||
}
|
||||
|
||||
# Load configuration file
|
||||
load_config
|
||||
|
||||
enable_color() {
|
||||
. /usr/local/share/bastille/colors.pre.sh
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user