diff --git a/.gitignore b/.gitignore index 6d0e360748e321a62e42d4ecefb46ce5928d67de..6a6960474e29238948911b1eb8f072a87675e109 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,4 @@ *.txt out/* CHANGELOG.md -data/data -logs/log profiling.log \ No newline at end of file diff --git a/scripts/pull.bash b/scripts/pull.bash index 66b149fcce3a6c1f473bbadacada3c10048a65a1..5e05b0c8fb54eab8d7faa0ca23882ae427af3b4a 100755 --- a/scripts/pull.bash +++ b/scripts/pull.bash @@ -1,5 +1,11 @@ #!/bin/bash +# wait until all other instances of the script are finished +while pidof -o %PPID -x "pull.bash">/dev/null; do + # check every 60 seconds + sleep 60 +done + cd `dirname "$0"`/.. echo $( date '+%F %H:%M:%S' ) | tee -a bash.log git pull 2>&1 | tee -a bash.log diff --git a/scripts/push.bash b/scripts/push.bash index 70a91e643dfe8fd443db8a7f8d4208cb81bb99ea..97757001b8845f77fd0229731fbd69550a5a749b 100755 --- a/scripts/push.bash +++ b/scripts/push.bash @@ -2,11 +2,12 @@ ls -la . ls -la data -ls -la log +ls -la logs +ps aux scripts/./write.bash -pip install multiprocessing_logging +pip3 install multiprocessing_logging python3 measure.py git add .