From 03faa21e848624e544cd389c1e4384f16bf79d28 Mon Sep 17 00:00:00 2001 From: Alain Reguera Delgado Date: Feb 24 2011 05:25:52 +0000 Subject: Merge content of initEnvironment.sh into centos-art.sh and remove initEnvironment.sh. Try to make things clear from the begining ;). --- diff --git a/Scripts/Bash/centos-art.sh b/Scripts/Bash/centos-art.sh index 67c9d0c..808d3fd 100755 --- a/Scripts/Bash/centos-art.sh +++ b/Scripts/Bash/centos-art.sh @@ -29,8 +29,33 @@ # $Id: centos-art.sh 70 2010-09-18 04:38:43Z al $ # ---------------------------------------------------------------------- -# Initialize function scripts. -. /home/centos/artwork/trunk/Scripts/Bash/initEnvironment.sh +# Initizalize centos-art.sh gettext internazionalization. +. gettext.sh +export TEXTDOMAIN=centos-art.sh +export TEXTDOMAINDIR=/home/centos/artwork/trunk/Locales/Scripts/centos-art.sh/ + +# Initialize centos-art.sh personal information. +export CLINAME='centos-art' +export CLIVERSION='1.0 (beta)' + +# Initialize centos-art.sh function scripts. +FILES=$(ls /home/centos/artwork/trunk/Scripts/Bash/Functions/{cli,cli_*}.sh) +for FILE in $FILES;do + if [[ -x $FILE ]];then + . $FILE + FUNCTION=$(grep '^function ' $FILE | cut -d' ' -f2) + export -f $FUNCTION + else + echo `gettext "The $FILE needs to have execution rights."` + exit + fi +done + +# Unset all variables not considered global in order to start cli +# execution with a clean environment. +unset FILE +unset FILES +unset FUNCTION # Initialize command line interface. cli "$@" diff --git a/Scripts/Bash/initEnvironment.sh b/Scripts/Bash/initEnvironment.sh deleted file mode 100755 index 6953ceb..0000000 --- a/Scripts/Bash/initEnvironment.sh +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/bash -# -# initFunctions.sh -- Initializes environment variables and functions -# used by centos-art.sh scripts. -# -# Copyright (C) 2009-2011 Alain Reguera Delgado -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 -# USA. -# -# ---------------------------------------------------------------------- -# $Id: initFunctions.sh 80 2010-09-18 06:57:26Z al $ -# ---------------------------------------------------------------------- - -# Initizalize centos-art.sh gettext internazionalization. -. gettext.sh -export TEXTDOMAIN=centos-art.sh -export TEXTDOMAINDIR=/home/centos/artwork/trunk/Locales/Scripts/Bash/ - -# Initialize centos-art.sh personal information. -export CLINAME='centos-art' -export CLIVERSION='1.0 (beta)' - -# Initialize centos-art.sh function scripts. -FILES=$(ls /home/centos/artwork/trunk/Scripts/Bash/Functions/{cli,cli_*}.sh) -for FILE in $FILES;do - if [[ -x $FILE ]];then - . $FILE - FUNCTION=$(grep '^function ' $FILE | cut -d' ' -f2) - export -f $FUNCTION - else - echo `gettext "The $FILE needs to have execution rights."` - exit - fi -done - -# Unset all variables not considered global in order to start cli -# execution with a clean environment. -unset FILE -unset FILES -unset FUNCTION