1 files changed, 11 insertions, 4 deletions
diff --git a/mltk b/mltk
index ed05a819..85675e93 100755
--- a/mltk
+++ b/mltk
@@ -18,9 +18,17 @@
 
 SELF=$(readlink -f $0)
 ROOT_DIR=$(dirname ${SELF})
+MLTK_PID="$$"
 
-. ${ROOT_DIR}/helper/functions.common.sh
+qnd_exit() {
+	unset_quiet
+	kill "$MLTK_PID"
+	[ $# -ge 1 ] && kill "$1"
+}
+
+. "${ROOT_DIR}/helper/logging.inc"
 . "${ROOT_DIR}/helper/useradd.inc"
+. "${ROOT_DIR}/helper/downloader.inc"
 
 banner () {
 	echo -e "\033[38;5;202m\t           __   __   __    "
@@ -115,12 +123,14 @@ read_params() {
 }
 
 run() {
+	[ "x$DEBUG" != "x1" ] && set_quiet
 	if [ $TARGET_TOOLS ]; then
 		. ${SETUP_TOOLS}
 	        [ $CLEAN ] && clean_tools $TOOLS
 	        [ $BUILD ] && generate_stage32 $TOOLS
 	fi
 	if [ $TARGET_CORE ]; then
+		unset_quiet # TODO: Make build_core logging.inc aware
 		. ${BUILD_CORE}
 	        [ $CLEAN ] && clean_core
 	        [ $BUILD ] && generate_stage31
@@ -130,7 +140,4 @@ run() {
 initial_checks
 read_params $@
 
-#exec 6>&1 > stdout.log
-#exec 2> stderr.log
-
 run