diff options
| -rw-r--r-- | roles/pipeliner/templates/updatepipeline.j2 | 6 | ||||
| -rw-r--r-- | roles/tesseractor/tasks/usefulbits.yml | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/roles/pipeliner/templates/updatepipeline.j2 b/roles/pipeliner/templates/updatepipeline.j2 index 511bd2a..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 && \ -go install ./cmd/bookpipeline && \ +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/ diff --git a/roles/tesseractor/tasks/usefulbits.yml b/roles/tesseractor/tasks/usefulbits.yml index 36183e5..38cb742 100644 --- a/roles/tesseractor/tasks/usefulbits.yml +++ b/roles/tesseractor/tasks/usefulbits.yml @@ -4,7 +4,7 @@ state: present name: - git - - python-pil + - python3-pil.imagetk - name: Clone useful repositories git: |