Import testing.conf file in function.sh
This is needed to have access to $LOGFILE and possibly other config settings.
This commit is contained in:
committed by
Tobias Brunner
parent
261cf0e395
commit
7c2ef58e86
+15
-12
@@ -14,6 +14,21 @@
|
||||
# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# for more details.
|
||||
|
||||
export TERM=xterm
|
||||
RED=$(tput setaf 1)
|
||||
GREEN=$(tput setaf 2)
|
||||
NORMAL=$(tput op)
|
||||
|
||||
# exit with given error message
|
||||
# $1 - error message
|
||||
die() {
|
||||
echo -e "${RED}$1${NORMAL}"
|
||||
exit 1
|
||||
}
|
||||
|
||||
[ -f testing.conf ] || die "Configuration file 'testing.conf' not found"
|
||||
. testing.conf
|
||||
|
||||
# execute command
|
||||
# $1 - command to execute
|
||||
# $2 - whether or not to log command exit status
|
||||
@@ -40,11 +55,6 @@ execute_chroot()
|
||||
execute "chroot $LOOPDIR $@"
|
||||
}
|
||||
|
||||
export TERM=xterm
|
||||
RED=$(tput setaf 1)
|
||||
GREEN=$(tput setaf 2)
|
||||
NORMAL=$(tput op)
|
||||
|
||||
function cecho {
|
||||
echo -e "\033[1;31m$1\033[0m"
|
||||
}
|
||||
@@ -76,13 +86,6 @@ log_status()
|
||||
echo
|
||||
}
|
||||
|
||||
# exit with given error message
|
||||
# $1 - error message
|
||||
die() {
|
||||
echo -e "${RED}$1${NORMAL}"
|
||||
exit 1
|
||||
}
|
||||
|
||||
#############################################
|
||||
# search and replace strings throughout a
|
||||
# whole directory
|
||||
|
||||
Reference in New Issue
Block a user