EvergreenCrypto/docker-finance
1
1
Fork 1
Code Issues 31 Pull Requests Actions Releases 10 Activity

Merge pull request #136 into master

Browse Source 
d4d7027 client: dev-tools: lib_linter: add DOCKER_FINANCE_CLIENT_PLUGINS (Aaron Fiore)
75ed30a client: Dockerfiles: dev-tools: add DOCKER_FINANCE_CLIENT_PLUGINS (Aaron Fiore)
7e53559 client: docker-finance.d: env: dev-tools: allow DOCKER_FINANCE_CLIENT_PLUGINS (Aaron Fiore)
This commit was merged in pull request #136.
This commit is contained in:
Aaron Fiore
2024-09-07 18:57:29 -07:00
parent c099010fa5 d4d7027f22
commit 9dcbff7826
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/Dockerfiles/dev-tools/docker-compose.yml.dev-tools.in
View File

@@ -30,10 +30,13 @@ services:
- ${DOCKER_FINANCE_CLIENT_REPO}/docker-finance.dox:${DOCKER_FINANCE_CLIENT_REPO}/docker-finance.dox
- ${DOCKER_FINANCE_CLIENT_REPO}/client:${DOCKER_FINANCE_CLIENT_REPO}/client
- ${DOCKER_FINANCE_CLIENT_REPO}/container:${DOCKER_FINANCE_CLIENT_REPO}/container
- ${DOCKER_FINANCE_CLIENT_PLUGINS}/client:${DOCKER_FINANCE_CLIENT_PLUGINS}/client
- ${DOCKER_FINANCE_CLIENT_PLUGINS}/container:${DOCKER_FINANCE_CLIENT_PLUGINS}/container
- /etc/localtime:/etc/localtime:ro
environment:
- DOCKER_FINANCE_VERSION=@DOCKER_FINANCE_VERSION@
- DOCKER_FINANCE_CLIENT_REPO=${DOCKER_FINANCE_CLIENT_REPO}
- DOCKER_FINANCE_CLIENT_PLUGINS=${DOCKER_FINANCE_CLIENT_PLUGINS}
- GID=${DOCKER_FINANCE_GID}
- UID=${DOCKER_FINANCE_UID}
deploy:

8
client/docker-finance.d/client/env/gen.bash vendored
View File

@@ -75,6 +75,10 @@ if [ -z "$DOCKER_FINANCE_CLIENT_REPO" ]; then
export DOCKER_FINANCE_CLIENT_REPO
fi
if [[ -z "$DOCKER_FINANCE_CLIENT_PLUGINS" ]]; then
export DOCKER_FINANCE_CLIENT_PLUGINS="${HOME}/plugins"
fi
if [[ "$global_platform" != "dev-tools" ]]; then
if [[ -z "$DOCKER_FINANCE_CLIENT_FLOW" ]]; then
export DOCKER_FINANCE_CLIENT_FLOW="${HOME}/finance-flow"
@@ -84,10 +88,6 @@ if [[ "$global_platform" != "dev-tools" ]]; then
export DOCKER_FINANCE_CLIENT_SHARED="${HOME}/share.d"
fi
if [[ -z "$DOCKER_FINANCE_CLIENT_PLUGINS" ]]; then
export DOCKER_FINANCE_CLIENT_PLUGINS="${HOME}/plugins"
fi
# hledger-web
if [[ -z "$DOCKER_FINANCE_PORT_HLEDGER" ]]; then
export DOCKER_FINANCE_PORT_HLEDGER="5000"

10
client/src/docker/lib/internal/dev-tools/lib_linter.bash
View File

@@ -147,7 +147,7 @@ function lib_linter::__lint_bash()
# Do all
for _ext in "${_exts[@]}"; do
lib_docker::__docker_compose exec -it docker-finance /bin/bash -i -c \
"find ${DOCKER_FINANCE_CLIENT_REPO}/ -type f -name \*.${_ext} \
"find ${DOCKER_FINANCE_CLIENT_REPO}/ ${DOCKER_FINANCE_CLIENT_PLUGINS}/ -type f -name \*.${_ext} \
| while read _file
do echo Linting \'\${_file}\'
$_shfmt \$_file \$_file && $_shellcheck \${_file}
@@ -178,7 +178,7 @@ function lib_linter::__lint_cpp()
# Do all
for _ext in "${_exts[@]}"; do
lib_docker::__docker_compose exec -it docker-finance /bin/bash -i -c \
"find ${DOCKER_FINANCE_CLIENT_REPO}/ -type f -name \*.${_ext} \
"find ${DOCKER_FINANCE_CLIENT_REPO}/ ${DOCKER_FINANCE_CLIENT_PLUGINS}/ -type f -name \*.${_ext} \
| while read _file
do echo Linting \'\${_file}\'
$_clang_format \$_file && $_cpplint \$_file && $_cppcheck \$_file
@@ -207,8 +207,8 @@ function lib_linter::__lint_php()
if [ -z "${_path[*]}" ]; then
# Do all
lib_docker::__docker_compose exec -it docker-finance /bin/bash -i -c \
"$_php_cs_fixer $DOCKER_FINANCE_CLIENT_REPO \
&& $_phpstan $DOCKER_FINANCE_CLIENT_REPO"
"$_php_cs_fixer $DOCKER_FINANCE_CLIENT_REPO && $_php_cs_fixer $DOCKER_FINANCE_CLIENT_PLUGINS \
&& $_phpstan $DOCKER_FINANCE_CLIENT_REPO $DOCKER_FINANCE_CLIENT_PLUGINS"
else
# Do only given file(s)
for _p in "${_path[@]}"; do
@@ -223,7 +223,7 @@ function lib_linter::__lint_php()
function lib_linter::__linter()
{
[ -z "$DOCKER_FINANCE_CLIENT_REPO" ] && lib_utils::die_fatal
[[ -z "$DOCKER_FINANCE_CLIENT_REPO" || -z "$DOCKER_FINANCE_CLIENT_PLUGINS" ]] && lib_utils::die_fatal
[[ ! "$PWD" =~ ^$DOCKER_FINANCE_CLIENT_REPO && ! -z "${global_arg_file[*]}" ]] \
&& lib_utils::die_fatal "Sorry, you must work (and lint) from within parent directory '${DOCKER_FINANCE_CLIENT_REPO}'"