diff --git a/Makefile b/Makefile index dfd3b9930..e464d5028 100644 --- a/Makefile +++ b/Makefile @@ -70,8 +70,7 @@ install: scripts/build.sh prod $(DESTDIR)/bin/$(BINARY_NAME) [ -f "$(GOBIN)/gosu" ] || go install github.com/tianon/gosu@latest cp $(GOBIN)/gosu $(DESTDIR)/bin/gosu - [ -f "$(GOBIN)/exif-read-tool" ] || go install github.com/dsoprea/go-exif/v3/command/exif-read-tool@latest - cp $(GOBIN)/exif-read-tool $(DESTDIR)/bin/exif-read-tool + [ ! -f "$(GOBIN)/exif-read-tool" ] || cp $(GOBIN)/exif-read-tool $(DESTDIR)/bin/exif-read-tool rsync -r -l --safe-links --exclude-from=assets/.buildignore --chmod=a+r,u+rw ./assets/ $(DESTDIR)/assets rsync -r -l --safe-links --exclude-from=scripts/dist/.buildignore --chmod=a+rx,u+rwx ./scripts/dist/ $(DESTDIR)/scripts mv $(DESTDIR)/scripts/heif-convert.sh $(DESTDIR)/bin/heif-convert diff --git a/docker/develop/armv7/Dockerfile b/docker/develop/armv7/Dockerfile index b527f3967..b7470f9d3 100644 --- a/docker/develop/armv7/Dockerfile +++ b/docker/develop/armv7/Dockerfile @@ -97,11 +97,11 @@ RUN echo 'Acquire::Retries "10";' > /etc/apt/apt.conf.d/80retry && \ # install Go tools RUN /usr/local/go/bin/go install github.com/tianon/gosu@latest && \ - /usr/local/go/bin/go install golang.org/x/tools/cmd/goimports@latest && \ - /usr/local/go/bin/go install github.com/kyoh86/richgo@latest; \ + /usr/local/go/bin/go install golang.org/x/tools/cmd/goimports@latest && \ + /usr/local/go/bin/go install github.com/dsoprea/go-exif/v3/command/exif-read-tool@latest; \ cp /go/bin/gosu /bin/gosu && \ - echo "alias go=richgo ll='ls -alh'" > /photoprism/.bash_aliases && \ - echo "alias go=richgo ll='ls -alh'" > /root/.bash_aliases && \ + echo "alias ll='ls -alh'" > /photoprism/.bash_aliases && \ + echo "alias ll='ls -alh'" > /root/.bash_aliases && \ echo "photoprism ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers && \ cp /root/.local/bin/heif-convert.sh /usr/local/bin/heif-convert && \ chmod -R a+rwX /go