diff --git a/.gitignore b/.gitignore index 93c3bdb..1e485cf 100644 --- a/.gitignore +++ b/.gitignore @@ -7,5 +7,6 @@ systems/* var/ +.firstRun .aliases .systems \ No newline at end of file diff --git a/bin/denv_msg b/bin/denv_msg index 4403c3a..91bed6b 100644 --- a/bin/denv_msg +++ b/bin/denv_msg @@ -1,4 +1,5 @@ #!/bin/bash +RESET='\033[0m' Black='\033[0;30m' Red='\033[0;31m' Green='\033[0;32m' @@ -9,17 +10,17 @@ Cyan='\033[0;36m' White='\033[0;37m' denv_error_msg () { - echo -e "${Red}$@${White}" + echo -e "${Red}$@${RESET}" } denv_success_msg () { - echo -e "${Green}$@${White}" + echo -e "${Green}$@${RESET}" } denv_info_msg () { - echo -e "${Cyan}$@${White}" + echo -e "${Cyan}$@${RESET}" } denv_echo_msg () { - echo -e "${White}$@" + echo -e "${White}$@${RESET}" } \ No newline at end of file diff --git a/script/foreachSystem/runScript b/script/foreachSystem/runScript index d856d1f..f2ed044 100755 --- a/script/foreachSystem/runScript +++ b/script/foreachSystem/runScript @@ -21,7 +21,7 @@ while IFS=' ' read -r IDENTIFIER DIRECTORY GIT; do fi denv_info_msg "System $IDENTIFIER" - SYSTEM_SCRIPT_DIRECTORY=$(realpath "systems/$DIRECTORY/bin/script") + SYSTEM_SCRIPT_DIRECTORY=$(realpath "$ENV_DIR/systems/$DIRECTORY/bin/script") COMMAND_PATH="$SYSTEM_SCRIPT_DIRECTORY/$COMMAND"; # Check if system directory already exists diff --git a/up b/up index d08bcce..544e06e 100755 --- a/up +++ b/up @@ -9,7 +9,7 @@ echo "" $ENV_DIR/script/foreachSystem/dcom up -d -if [[ ! -f "$ENV_DIR/var/.firstRun" ]] ; then +if [[ ! -f "$ENV_DIR/.firstRun" ]] ; then $ENV_DIR/script/foreachSystem/runScript firstRun - touch "$ENV_DIR/var/.firstRun" + touch "$ENV_DIR/.firstRun" fi \ No newline at end of file