fatalerrors/init.sh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added lib/utils.sh and reorganised some files according to it

Browse Source
This commit is contained in:
levasseur
2021-10-25 15:48:40 +02:00
parent e1694d12cf
commit d1a2759ef6
2 changed files with 46 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/support.sh
View File

@@ -101,30 +101,4 @@ show_version()
} }
export -f show_version export -f show_version
# ------------------------------------------------------------------------------
# Get module name from module file
get_mod_name()
{
if [[ $# -ne 1 ]]; then
prnt E "get_mod_name(): Bad number of parameters."
die 11 --force
fi
echo $(basename $1 | cut -f 1 -d '.')
}
export -f get_mod_name
# ------------------------------------------------------------------------------
# Set system proxy vars
set_system_proxy()
{
# Declare proxy system vars if needed and if not already declared
if [[ -n $PROXYSRV && -n $PROXYSRVPORT && -z $NO_PROXY ]]; then
export http_proxy=${http_proxy:-"http://$PROXYSRV:$PROXYSRVPORT/"}
export https_proxy=${https_proxy:-"http://$PROXYSRV:$PROXYSRVPORT/"}
fi
}
export -f set_system_proxy
# EOF # EOF

46
lib/utils.sh Normal file
View File

@@ -0,0 +1,46 @@
# ------------------------------------------------------------------------------
# Various utilitary functions
# This file is part of the init.sh project
# Copyright (c) 2019-2021 Geoffray Levasseur <fatalerrors@geoffray-levasseur.org>
# ------------------------------------------------------------------------------
# This file is distributed under 3-clause BSD license.
# The complete license agreement can be obtained at:
# https://opensource.org/licenses/BSD-3-Clause
# ------------------------------------------------------------------------------
# ------------------------------------------------------------------------------
# Check if a function exists, return 0 if so
function_exists() {
declare -f -F $1 > /dev/null
return $?
}
# ------------------------------------------------------------------------------
# Get module name from module file
get_mod_name()
{
if [[ $# -ne 1 ]]; then
prnt E "get_mod_name(): Bad number of parameters."
die 11 --force
fi
echo $(basename $1 | cut -f 1 -d '.')
}
export -f get_mod_name
# ------------------------------------------------------------------------------
# Set system proxy vars
set_system_proxy()
{
# Declare proxy system vars if needed and if not already declared
if [[ -n $PROXYSRV && -n $PROXYSRVPORT && -z $NO_PROXY ]]; then
export http_proxy=${http_proxy:-"http://$PROXYSRV:$PROXYSRVPORT/"}
export https_proxy=${https_proxy:-"http://$PROXYSRV:$PROXYSRVPORT/"}
fi
}
export -f set_system_proxy
# EOF