flo/dev-env
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

denv update

Browse Source
This commit is contained in:
Flo 2024-12-21 14:19:50 +01:00
parent 827cb9c472
commit d2dbeece34
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/dcom
View File

@ -48,8 +48,7 @@ dcom() {
return 1
fi
denv_info_msg "System: $SYSTEM_IDENTIFIER"
denv_info_msg "Command: $DOCKER_COMPOSE_COMMAND"
denv_info_msg "[$SYSTEM_IDENTIFIER]: $DOCKER_COMPOSE_COMMAND"
if [[ -f "$SYSTEM_ENV_FILE" ]] ; then
export $(grep -v '^#' "$SYSTEM_ENV_FILE" | xargs)

5
bin/drun
View File

@ -48,8 +48,7 @@ drun() {
return 1
fi
denv_info_msg "System: $SYSTEM_IDENTIFIER"
denv_info_msg "Command: $DOCKER_EXEC_COMMAND"
denv_info_msg "[$SYSTEM_IDENTIFIER]: $DOCKER_EXEC_COMMAND"
if [[ -f "$SYSTEM_ENV_FILE" ]] ; then
export $(grep -v '^#' "$SYSTEM_ENV_FILE" | xargs)
@ -69,7 +68,7 @@ drun() {
docker compose -f "$DOCKER_COMPOSE_FILE" exec -it $APP_CONTAINER $DOCKER_EXEC_COMMAND
else
denv_echo_msg "docker compose"
docker compose -f "$DOCKER_COMPOSE_FILE" exec $APP_CONTAINER $DOCKER_EXEC_COMMAND
docker compose -f "$DOCKER_COMPOSE_FILE" exec -T $APP_CONTAINER $DOCKER_EXEC_COMMAND
fi
# Unset .env variables if a file exist

2
init
View File

@ -24,7 +24,7 @@ echo ""
# Clone all systems.
denv_info_msg "[dev-env]: Clone systems"
$ENV_DIR/script/clone
denv_info_msg "[dev-env]: Cloned systems"
denv_success_msg "[dev-env]: Cloned systems"
echo ""
# Run init for all systems

2
script/clone
View File

@ -16,7 +16,7 @@ while IFS=' ' read -r IDENTIFIER DIRECTORY GIT; do
continue
fi
denv_info_msg "System $IDENTIFIER"
denv_info_msg "[$IDENTIFIER]"
DIRECTORY="systems/$DIRECTORY"

2
script/foreachSystem/dcom
View File

@ -12,7 +12,7 @@ if [ ! -f "$CONFIG_FILE" ]; then
exit 1
fi
denv_info_msg "Executing $COMMAND for all systems defined in $CONFIG_FILE"
denv_info_msg "[dev-env]: Executing $COMMAND for all systems"
while IFS=' ' read -r IDENTIFIER DIRECTORY GIT; do # Iterate through all lines in .systems configuration
if [[ "$IDENTIFIER" =~ ^#.* ]] || [ -z "$IDENTIFIER" ]; then # Skip comments and emtpy lines

4
script/foreachSystem/runScript
View File

@ -11,7 +11,7 @@ if [ ! -f "$CONFIG_FILE" ]; then
exit 1
fi
denv_info_msg "[dev-env]: Execute $COMMAND foreach System"
denv_info_msg "[dev-env]: Execute $COMMAND for all systems"
# Iterate through all lines in .systems configuration
while IFS=' ' read -r IDENTIFIER DIRECTORY GIT; do
@ -20,7 +20,7 @@ while IFS=' ' read -r IDENTIFIER DIRECTORY GIT; do
continue
fi
denv_info_msg "System $IDENTIFIER"
denv_info_msg "[$IDENTIFIER]: $COMMAND"
SYSTEM_SCRIPT_DIRECTORY=$(realpath "$ENV_DIR/systems/$DIRECTORY/bin/script")
COMMAND_PATH="$SYSTEM_SCRIPT_DIRECTORY/$COMMAND";