merging conflict

This commit is contained in:
hugogogo
2021-12-17 19:28:55 +01:00
6 changed files with 243 additions and 219 deletions

View File

@@ -20,8 +20,11 @@ cd $(dirname $0)
ENDCO="\e[0m"
# globale variables
# copy the executable to current directory
MINISHELL="../minishell"
cp $MINISHELL .
# globale variables
TEST_DIR="./tests/"
DEFAULT_DIR="./tests/defaults/"
UNIT_TEST=0
@@ -39,8 +42,6 @@ cd $(dirname $0)
BASH_LOG="./logs/bash_log.txt"
MINISHELL_LOG="./logs/minishell_log.txt"
# copy the executable to current directory
cp $MINISHELL .
# to delete the files created during the script
function delete_files