From 061d7cb3406c99a8bbb7b563625fe00357ba90aa Mon Sep 17 00:00:00 2001
From: jnqnfe <jnqnfe@gmail.com>
Date: Thu, 5 Feb 2015 03:30:47 +0000
Subject: tidy script init (2/4) - build stage scripts

Partial fix for #952919

Gbp-Dch: Short
---
 scripts/build/installer | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'scripts/build/installer')

diff --git a/scripts/build/installer b/scripts/build/installer
index 6ddd1db6d..108f6ff31 100755
--- a/scripts/build/installer
+++ b/scripts/build/installer
@@ -13,23 +13,19 @@ set -e
 # Including common functions
 [ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
 
-# Automatically populating config tree
-if [ -x auto/config ] && [ ! -e .build/config ]
-then
-	Echo_message "Automatically populating config tree."
-	lb config
-fi
-
 # Setting static variables
 DESCRIPTION="Preparing installer images"
 HELP=""
 USAGE="${PROGRAM} [--force]"
 
+# Automatically populating config tree
+Auto_build_config
+
 # Processing arguments and configuration files
 Init_config_data "${@}"
 
-# Setup cleanup function
-Setup_cleanup
+# Setting up cleanup function
+Setup_clean_exit
 
 if [ "${LB_BUILD_WITH_CHROOT}" = "true" ]
 then
-- 
cgit v1.2.3