Fixed path to functions library files.

This commit is contained in:
Manuel Canales Esparcia 2006-11-11 17:21:38 +00:00
parent c917342708
commit d5173561e4
3 changed files with 11 additions and 10 deletions

7
README
View file

@ -113,6 +113,9 @@ $Id$
/CLFS2/master.sh /CLFS2/master.sh
/clfs2.xsl /clfs2.xsl
/CLFS3/master.sh
/clfs3.xsl
/HLFS/master.sh /HLFS/master.sh
/hlfs.xsl /hlfs.xsl
@ -121,14 +124,12 @@ $Id$
/common/common_functions /common/common_functions
/makefile_functions /makefile_functions
/func_check_versions.sh
/func_validate_configs.sh
/packages.xsl /packages.xsl
/urls.xsl /urls.xsl
/create-sbu_du-report.sh /create-sbu_du-report.sh
/func_compare.sh
/progress_bar.sh /progress_bar.sh
/blfs-tool-deps/9xx-* /blfs-tool-deps/9xx-*
/libs/*
/contrib/jhalfs-paco.patch /contrib/jhalfs-paco.patch

View file

@ -73,12 +73,12 @@ source configuration
[[ $VERBOSITY > 0 ]] && echo "OK" [[ $VERBOSITY > 0 ]] && echo "OK"
[[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_check_version.sh>..." [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_check_version.sh>..."
source $COMMON_DIR/func_check_version.sh source $COMMON_DIR/libs/func_check_version.sh
[[ $? > 0 ]] && echo " function module did not load.." && exit 2 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
[[ $VERBOSITY > 0 ]] && echo "OK" [[ $VERBOSITY > 0 ]] && echo "OK"
[[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_validate_configs.sh>..." [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_validate_configs.sh>..."
source $COMMON_DIR/func_validate_configs.sh source $COMMON_DIR/libs/func_validate_configs.sh
[[ $? > 0 ]] && echo " function module did not load.." && exit 2 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
[[ $VERBOSITY > 0 ]] && echo "OK" [[ $VERBOSITY > 0 ]] && echo "OK"
[[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}" [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"

10
jhalfs
View file

@ -255,17 +255,17 @@ source $MODULE
#*******************************************************************# #*******************************************************************#
[[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_check_version.sh>..." [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_check_version.sh>..."
source $COMMON_DIR/func_check_version.sh source $COMMON_DIR/libs/func_check_version.sh
[[ $? > 0 ]] && echo " function module did not load.." && exit 2 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
[[ $VERBOSITY > 0 ]] && echo "OK" [[ $VERBOSITY > 0 ]] && echo "OK"
[[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_validate_configs.sh>..." [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_validate_configs.sh>..."
source $COMMON_DIR/func_validate_configs.sh source $COMMON_DIR/libs/func_validate_configs.sh
[[ $? > 0 ]] && echo " function module did not load.." && exit 2 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
[[ $VERBOSITY > 0 ]] && echo "OK" [[ $VERBOSITY > 0 ]] && echo "OK"
[[ $VERBOSITY > 0 ]] && echo -n "Loading function <custom_pkgs>..." [[ $VERBOSITY > 0 ]] && echo -n "Loading function <custom_pkgs>..."
source $COMMON_DIR/custom_pkgs source $COMMON_DIR/libs/custom_pkgs
[[ $? > 0 ]] && echo " function module did not load.." && exit 2 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
[[ $VERBOSITY > 0 ]] && echo "OK" [[ $VERBOSITY > 0 ]] && echo "OK"
@ -296,8 +296,8 @@ echo "${nl_}${SD_BORDER}${nl_}"
# compare module # compare module
if [[ "$COMPARE" = "y" ]]; then if [[ "$COMPARE" = "y" ]]; then
[[ $VERBOSITY > 0 ]] && echo -n "Loading compare module..." [[ $VERBOSITY > 0 ]] && echo -n "Loading compare module..."
source $COMMON_DIR/func_compare.sh source $COMMON_DIR/libs/func_compare.sh
[[ $? > 0 ]] && echo "$COMMON_DIR/func_compare.sh did not load.." && exit [[ $? > 0 ]] && echo "$COMMON_DIR/libs/func_compare.sh did not load.." && exit
[[ $VERBOSITY > 0 ]] && echo "OK" [[ $VERBOSITY > 0 ]] && echo "OK"
fi fi
# #