diff --git a/.gitignore b/.gitignore index f78c716..29a1e95 100644 --- a/.gitignore +++ b/.gitignore @@ -54,4 +54,4 @@ src/core/pyros_django/obsconfig/fixtures/obsconfig.p *.copy *.modif *.modif.* - +*.moi diff --git a/docker/KILL_PYROS_DOCKER_RUN b/docker/KILL_PYROS_DOCKER_RUN index cf1ccad..468ac69 100755 --- a/docker/KILL_PYROS_DOCKER_RUN +++ b/docker/KILL_PYROS_DOCKER_RUN @@ -4,6 +4,7 @@ OS=$(uname) #echo $OS if [[ $OS == "Darwin" ]] ; then + #echo "Mac OS" docker exec pyros bash docker/$0 $1 exit fi diff --git a/docker/KILL_PYROS_DOCKER_RUN_mac b/docker/KILL_PYROS_DOCKER_RUN_mac deleted file mode 100755 index 9043ce4..0000000 --- a/docker/KILL_PYROS_DOCKER_RUN_mac +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash - -#if no container is running -if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 2 ] -then - echo "db_pyros or pyros weren't running, starting them..." - ./PYROS_DOCKER_START.bat -fi - -#docker exec pyros bash -c docker/KILL_PYROS_DOCKER_RUN -docker exec pyros bash docker/KILL_PYROS_DOCKER_RUN $1 - -- libgit2 0.21.2