diff options
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/pipeliner/templates/updatepipeline.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/pipeliner/templates/updatepipeline.j2 b/roles/pipeliner/templates/updatepipeline.j2 index 29acf34..87918c4 100644 --- a/roles/pipeliner/templates/updatepipeline.j2 +++ b/roles/pipeliner/templates/updatepipeline.j2 @@ -3,9 +3,9 @@ s="/home/{{ ansible_user }}/src" t="/home/{{ ansible_user }}/trainings" cd "$s/bookpipeline" && \ -git pull && \ +git pull -Xtheirs && \ /usr/local/go/bin/go install ./cmd/bookpipeline && \ sudo cp "$HOME/go/bin/bookpipeline" /usr/local/bin/ || exit 1 -cd "$t" && git pull && \ +cd "$t" && git pull -Xtheirs && \ sudo cp "$t"/* /usr/local/share/tesseract-ocr/tessdata/ |