diff --git a/bin/dcom b/bin/dcom index c34d35b..b58f642 100644 --- a/bin/dcom +++ b/bin/dcom @@ -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) diff --git a/bin/drun b/bin/drun index bb53acf..679552b 100644 --- a/bin/drun +++ b/bin/drun @@ -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 diff --git a/init b/init index 3ed2366..dc7443e 100755 --- a/init +++ b/init @@ -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 diff --git a/script/clone b/script/clone index d72bc1a..4df9050 100755 --- a/script/clone +++ b/script/clone @@ -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" diff --git a/script/foreachSystem/dcom b/script/foreachSystem/dcom index 3c4fb9c..5236e3b 100755 --- a/script/foreachSystem/dcom +++ b/script/foreachSystem/dcom @@ -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 diff --git a/script/foreachSystem/runScript b/script/foreachSystem/runScript index f2ed044..7092059 100755 --- a/script/foreachSystem/runScript +++ b/script/foreachSystem/runScript @@ -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";