From c3cf81572bba2ef17273d31f8bac61e98019fb6d Mon Sep 17 00:00:00 2001 From: Aaron Fiore Date: Sun, 22 Sep 2024 18:33:10 -0700 Subject: [PATCH] client: src: refactor system checks - UID and dependency checks are done in internal `lib_docker`/`lib_env` - Moves `sed` check to appropriate `lib_env` --- client/src/docker/lib/internal/lib_env.bash | 18 ++++-------------- client/src/docker/lib/lib_docker.bash | 8 -------- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/client/src/docker/lib/internal/lib_env.bash b/client/src/docker/lib/internal/lib_env.bash index 70120c2..ef09ad2 100644 --- a/client/src/docker/lib/internal/lib_env.bash +++ b/client/src/docker/lib/internal/lib_env.bash @@ -34,23 +34,13 @@ if [ $UID -lt 1000 ]; then lib_utils::die_fatal "Do not run as root or system user!" fi +# Dependencies +deps=("sed") +lib_utils::deps_check "${deps[@]}" + # IMPORTANT: keep umask for security umask o-rwx -if ! docker compose version 1>/dev/null; then - lib_utils::die_fatal "Docker compose plugin not installed" -fi - -if [ -z "$EDITOR" ]; then - editors=("vim" "vi" "emacs" "nano") - for editor in "${editors[@]}"; do - hash "$editor" &>/dev/null && export EDITOR="$editor" && break - done - if [ $? -ne 0 ]; then - lib_utils::die_fatal "Shell EDITOR is not set, export EDITOR in your shell" - fi -fi - # # "Constructor" for environment generation # diff --git a/client/src/docker/lib/lib_docker.bash b/client/src/docker/lib/lib_docker.bash index 35c2fe9..5b783e1 100644 --- a/client/src/docker/lib/lib_docker.bash +++ b/client/src/docker/lib/lib_docker.bash @@ -47,14 +47,6 @@ source "${DOCKER_FINANCE_CLIENT_REPO}/container/src/finance/lib/internal/lib_uti # Implementation # -if [ $UID -lt 1000 ]; then - lib_utils::die_fatal "Do not run as root or system user!" -fi - -# Dependencies -deps=("sed") -lib_utils::deps_check "${deps[@]}" - # Top-level caller global_basename="$(basename -- $0)" declare -rx global_basename