From c35e55f9c8560713a740999e9715cba21bc2282a Mon Sep 17 00:00:00 2001 From: belliash Date: Wed, 28 Dec 2011 14:57:22 +0100 Subject: [PATCH] Remove duplicated code --- libraries/common | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libraries/common b/libraries/common index fe6950e..68fd240 100644 --- a/libraries/common +++ b/libraries/common @@ -47,25 +47,25 @@ function isSet() { # Loads EzBuild configuration #------------------------------------------------------------------------------- function loadConfiguration() { - source ${EZROOT}/config/${EZNAME}.conf &> /dev/null || panic "Unable to load configuration files!\nYour EzBuild installation seems to be broken..." - source ${EZROOT}/config/layout.conf &> /dev/null || panic "Unable to load configuration files!\nYour EzBuild installation seems to be broken..." - source /etc/ezbuild/${EZNAME}.conf &> /dev/null || panic "Unable to load configuration files!\nYour EzBuild installation seems to be broken..." - source /etc/ezbuild/layout.conf &> /dev/null || panic "Unable to load configuration files!\nYour EzBuild installation seems to be broken..." + source ${EZROOT}/config/${EZNAME}.conf &> /dev/null || panic + source ${EZROOT}/config/layout.conf &> /dev/null || panic + source /etc/ezbuild/${EZNAME}.conf &> /dev/null || panic + source /etc/ezbuild/layout.conf &> /dev/null || panic } #------------------------------------------------------------------------------- # Loads all EzBuild Libraries #------------------------------------------------------------------------------- function loadLibraries() { - source ${EZROOT}/libraries/colors &> /dev/null || panic "Unable to load necessary libraries!\nYour EzBuild installation seems to be broken..." + source ${EZROOT}/libraries/colors &> /dev/null || panic } #------------------------------------------------------------------------------- # Outputs error message and aborts program execution -# Parameters: %message% #------------------------------------------------------------------------------- function panic() { - echo -e "FATAL ERROR: ${@}" + echo -e "FATAL ERROR: Unable to load necessary files!" + echo -e "Your EzBuild installation seems to be broken..." exit 1 }