AaronFiore/docker-finance
1
0
Fork 0
forked from EvergreenCrypto/docker-finance
Code Activity

Merge pull request #207 into master

Browse Source 
8fed7f8 client: lib_docker: make fatal if user not given (Aaron Fiore)
c2789f5 client: docker: don't make fatal for empty/invalid command (Aaron Fiore)
38391e0 client: lib_env: fix handling of global command (Aaron Fiore)
fd338b6 client: docker/lib_docker: make fatal for unsupported platform (Aaron Fiore)
This commit is contained in:
Aaron Fiore
2025-08-12 12:04:52 -07:00
parent 07d1cd13f1 8fed7f8c54
commit 18e1993468
3 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/docker/docker.bash
View File

@@ -2,7 +2,7 @@
# docker-finance | modern accounting for the power-user
#
# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC)
# Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -52,7 +52,7 @@ function main()
<platform/user:tag>
platform \e[34;3mBase image platform (default: archlinux)\e[0m
platform \e[34;3mBase image platform (archlinux | ubuntu | dev-tools)\e[0m
user \e[34;3mUser to bind-mount with (default: ${USER})\e[0m
tag \e[34;3mImage tag type to use (default: latest)\e[0m
@@ -167,7 +167,7 @@ function main()
# Command facade
#
[ -z "$global_command" ] && lib_utils::die_fatal
# shellcheck disable=SC2154
case "$global_command" in
gen)
lib_docker::gen "${@:3}"

10
client/src/docker/lib/internal/lib_env.bash
View File

@@ -2,7 +2,7 @@
# docker-finance | modern accounting for the power-user
#
# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC)
# Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -120,12 +120,10 @@ function lib_env::env()
lib_env::__write "$_env_file"
fi
else
[ -z "$global_command" ] && lib_utils::die_fatal
[ -z "$global_basename" ] && lib_utils::die_fatal
if [[ -z "$global_command" || "$global_command" != "gen" ]]; then
# shellcheck disable=SC2154
if [ "$global_command" != "gen" ]; then
lib_utils::die_fatal \
"Client environment not found! Run gen command'"
"Client environment not found! Run 'gen' command"
fi
lib_utils::print_info \

6
client/src/docker/lib/lib_docker.bash
View File

@@ -2,7 +2,7 @@
# docker-finance | modern accounting for the power-user
#
# Copyright (C) 2021-2024 Aaron Fiore (Founder, Evergreen Crypto LLC)
# Copyright (C) 2021-2025 Aaron Fiore (Founder, Evergreen Crypto LLC)
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -78,11 +78,11 @@ function lib_docker::docker()
IFS="/" read -ra _image <<<"$1"
declare -gx global_platform="${_image[0]}"
local -r _user="${_image[1]}"
[ -z "$_user" ] && lib_utils::die_fatal "User not given for '${_image[*]}'"
lib_utils::print_debug "global_platform=${global_platform}"
if [[ ! "$global_platform" =~ ^archlinux$|^ubuntu$|^dev-tools$ ]]; then
lib_utils::print_warning "unsupported platform '${global_platform}', defaulting to Arch Linux"
global_platform="archlinux"
lib_utils::die_fatal "Unsupported platform '${global_platform}'"
fi
# Parse tag