Compare commits
2 Commits
0c7eac89fc
...
79a1ec4cc3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
79a1ec4cc3 | ||
|
|
7ec1e33b56 |
3
init.sh
3
init.sh
@ -33,8 +33,7 @@ displayLibrePortalLogo() {
|
||||
echo "
|
||||
╦ ┬┌┐ ┬─┐┌─┐ ╭─╮ ╔═╗┌─┐┬─┐┌┬┐┌─┐┬
|
||||
║ │├┴┐├┬┘├┤ │◉│ ╠═╝│ │├┬┘ │ ├─┤│
|
||||
╩═╝┴└─┘┴└─└─┘ ╨─╨ ╩ └─┘┴└─ ┴ ┴ ┴┴─┘
|
||||
_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁"
|
||||
╩═╝┴└─┘┴└─└─┘ ╨─╨ ╩ └─┘┴└─ ┴ ┴ ┴┴─┘"
|
||||
echo ""
|
||||
}
|
||||
|
||||
|
||||
@ -9,6 +9,22 @@ dockerInstallApp()
|
||||
local app_name_ucfirst="$(tr '[:lower:]' '[:upper:]' <<< ${app_name:0:1})${app_name:1}"
|
||||
local installFuncName="install${app_name_ucfirst}"
|
||||
|
||||
# App slugs are lowercase (e.g. "libreportal"), but installer functions keep
|
||||
# their own internal capitalisation (e.g. installLibrePortal) — capitalising
|
||||
# only the first letter can't reproduce that camelCase. If the naive name
|
||||
# isn't a defined function, resolve it case-insensitively against the real
|
||||
# function table so any compound brand/app name (LibrePortal, …) just works.
|
||||
if ! declare -F "$installFuncName" >/dev/null 2>&1; then
|
||||
local _resolved
|
||||
_resolved="$(compgen -A function | grep -ixF "install${app_name}" | head -n1)"
|
||||
[[ -n "$_resolved" ]] && installFuncName="$_resolved"
|
||||
fi
|
||||
|
||||
if ! declare -F "$installFuncName" >/dev/null 2>&1; then
|
||||
isError "No installer function found for app '${app_name}' (looked for ${installFuncName})."
|
||||
return 1
|
||||
fi
|
||||
|
||||
if [[ "$reset_network" == "true" ]]; then
|
||||
export LIBREPORTAL_RESET_NETWORK=1
|
||||
if declare -f ipRemoveFromDatabase >/dev/null 2>&1; then
|
||||
|
||||
@ -41,8 +41,7 @@ isHeader() {
|
||||
echo "
|
||||
╦ ┬┌┐ ┬─┐┌─┐ ╭─╮ ╔═╗┌─┐┬─┐┌┬┐┌─┐┬
|
||||
║ │├┴┐├┬┘├┤ │◉│ ╠═╝│ │├┬┘ │ ├─┤│
|
||||
╩═╝┴└─┘┴└─└─┘ ╨─╨ ╩ └─┘┴└─ ┴ ┴ ┴┴─┘
|
||||
_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁_▁"
|
||||
╩═╝┴└─┘┴└─└─┘ ╨─╨ ╩ └─┘┴└─ ┴ ┴ ┴┴─┘"
|
||||
echo ""
|
||||
|
||||
isHeader "Regenerating Array Files"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user