From dc66625350796c1a2263e1bce78efd056397a0f6 Mon Sep 17 00:00:00 2001 From: Michael Mayer Date: Sun, 23 Apr 2023 09:27:45 +0200 Subject: [PATCH] =?UTF-8?q?CI:=20Replace=20"=E2=80=A6"=20with=20"..."?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michael Mayer --- Makefile | 32 ++++++++++++++++---------------- scripts/build.sh | 2 +- scripts/download-facenet.sh | 4 ++-- scripts/download-nasnet.sh | 4 ++-- scripts/download-nsfw.sh | 4 ++-- scripts/gettext-clear-fuzzy.sh | 4 ++-- scripts/gettext-merge.sh | 4 ++-- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index 34603d39d..80870062d 100644 --- a/Makefile +++ b/Makefile @@ -84,7 +84,7 @@ logs: help: @echo "For build instructions, visit ." fix-permissions: - $(info Updating filesystem permissions…) + $(info Updating filesystem permissions...) @if [ $(UID) != 0 ]; then\ echo "Running \"chown --preserve-root -Rcf $(UID):$(GID) /go /photoprism /opt/photoprism /tmp/photoprism\". Please wait."; \ sudo chown --preserve-root -Rcf $(UID):$(GID) /go /photoprism /opt/photoprism /tmp/photoprism || true;\ @@ -106,10 +106,10 @@ clean: [ ! -d "$(BUILD_PATH)" ] || rm -rf --preserve-root $(BUILD_PATH) [ ! -d "$(JS_BUILD_PATH)" ] || rm -rf --preserve-root $(JS_BUILD_PATH) tar.gz: - $(info Creating tar.gz archives from the directories in "$(BUILD_PATH)"…) + $(info Creating tar.gz archives from the directories in "$(BUILD_PATH)"...) find "$(BUILD_PATH)" -maxdepth 1 -mindepth 1 -type d -exec tar --exclude='.[^/]*' -C {} -czf {}.tar.gz . \; install: - $(info Installing in "$(DESTDIR)"…) + $(info Installing in "$(DESTDIR)"...) @[ ! -d "$(DESTDIR)" ] || (echo "ERROR: Install path '$(DESTDIR)' already exists!"; exit 1) mkdir --mode=$(INSTALL_MODE) -p $(DESTDIR) env TMPDIR="$(BUILD_PATH)" ./scripts/dist/install-tensorflow.sh $(DESTDIR) @@ -228,46 +228,46 @@ build-tensorflow-arm64: watch-js: (cd frontend && env NODE_ENV=development npm run watch) test-js: - $(info Running JS unit tests…) + $(info Running JS unit tests...) (cd frontend && env TZ=UTC NODE_ENV=development BABEL_ENV=test npm run test) acceptance: - $(info Running public-mode tests in 'chromium:headless'…) + $(info Running public-mode tests in 'chromium:headless'...) (cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=public --config-file ./testcaferc.json "tests/acceptance") acceptance-short: - $(info Running JS acceptance tests in Chrome…) + $(info Running JS acceptance tests in Chrome...) (cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=public,type=short --config-file ./testcaferc.json "tests/acceptance") acceptance-firefox: - $(info Running JS acceptance tests in Firefox…) + $(info Running JS acceptance tests in Firefox...) (cd frontend && npm run testcafe -- firefox:headless --test-grep "^(Common|Core)\:*" --test-meta mode=public --config-file ./testcaferc.json "tests/acceptance") acceptance-auth: - $(info Running JS acceptance-auth tests in Chrome…) + $(info Running JS acceptance-auth tests in Chrome...) (cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=auth --config-file ./testcaferc.json "tests/acceptance") acceptance-auth-short: - $(info Running JS acceptance-auth tests in Chrome…) + $(info Running JS acceptance-auth tests in Chrome...) (cd frontend && npm run testcafe -- chrome:headless --test-grep "^(Common|Core)\:*" --test-meta mode=auth,type=short --config-file ./testcaferc.json "tests/acceptance") acceptance-auth-firefox: - $(info Running JS acceptance-auth tests in Firefox…) + $(info Running JS acceptance-auth tests in Firefox...) (cd frontend && npm run testcafe -- firefox:headless --test-grep "^(Common|Core)\:*" --test-meta mode=auth --config-file ./testcaferc.json "tests/acceptance") reset-mariadb: - $(info Resetting photoprism database…) + $(info Resetting photoprism database...) mysql < scripts/sql/reset-photoprism.sql reset-mariadb-testdb: - $(info Resetting testdb database…) + $(info Resetting testdb database...) mysql < scripts/sql/reset-testdb.sql reset-mariadb-local: - $(info Resetting local database…) + $(info Resetting local database...) mysql < scripts/sql/reset-local.sql reset-mariadb-acceptance: - $(info Resetting acceptance database…) + $(info Resetting acceptance database...) mysql < scripts/sql/reset-acceptance.sql reset-mariadb-all: reset-mariadb-testdb reset-mariadb-local reset-mariadb-acceptance reset-mariadb-photoprism reset-testdb: reset-sqlite reset-mariadb-testdb reset-acceptance: reset-mariadb-acceptance reset-sqlite: - $(info Removing test database files…) + $(info Removing test database files...) find ./internal -type f -name ".test.*" -delete run-test-short: - $(info Running short Go tests in parallel mode…) + $(info Running short Go tests in parallel mode...) $(GOTEST) -parallel 2 -count 1 -cpu 2 -short -timeout 5m ./pkg/... ./internal/... run-test-go: $(info Running all Go tests...) diff --git a/scripts/build.sh b/scripts/build.sh index 66266fb82..b85e2992a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -17,7 +17,7 @@ BUILD_BIN=${2:-photoprism} GO_BIN=${GO_BIN:-go} GO_VER=$($GO_BIN version) -echo "Building PhotoPrism ${BUILD_ID} ($1)…" +echo "Building PhotoPrism ${BUILD_ID} ($1)..." if [[ $1 == "debug" ]]; then BUILD_CMD=("$GO_BIN" build -tags=debug -ldflags "-X main.version=${BUILD_ID}-DEBUG" -o "${BUILD_BIN}" cmd/photoprism/photoprism.go) diff --git a/scripts/download-facenet.sh b/scripts/download-facenet.sh index decbc5ba2..cde93b402 100755 --- a/scripts/download-facenet.sh +++ b/scripts/download-facenet.sh @@ -10,7 +10,7 @@ MODEL_HASH="0492eb1d67789108b7eefb274e26633504b059be $MODEL_ZIP" MODEL_VERSION="$MODEL_PATH/version.txt" MODEL_BACKUP="storage/backup/facenet-$TODAY" -echo "Installing $MODEL_NAME model for TensorFlow…" +echo "Installing $MODEL_NAME model for TensorFlow..." # Create directories mkdir -p /tmp/photoprism @@ -24,7 +24,7 @@ if [[ -f ${MODEL_ZIP} ]] && [[ $(sha1sum ${MODEL_ZIP}) == ${MODEL_HASH} ]]; then fi else # Download model - echo "Downloading latest model from $MODEL_URL…" + echo "Downloading latest model from $MODEL_URL..." wget --inet4-only -c "${MODEL_URL}" -O ${MODEL_ZIP} TMP_HASH=$(sha1sum ${MODEL_ZIP}) diff --git a/scripts/download-nasnet.sh b/scripts/download-nasnet.sh index 1d12628f9..d5bc08e10 100755 --- a/scripts/download-nasnet.sh +++ b/scripts/download-nasnet.sh @@ -10,7 +10,7 @@ MODEL_HASH="f18b801354e95cade497b4f12e8d2537d04c04f6 $MODEL_ZIP" MODEL_VERSION="$MODEL_PATH/version.txt" MODEL_BACKUP="storage/backup/nasnet-$TODAY" -echo "Installing $MODEL_NAME model for TensorFlow…" +echo "Installing $MODEL_NAME model for TensorFlow..." # Create directories mkdir -p /tmp/photoprism @@ -24,7 +24,7 @@ if [[ -f ${MODEL_ZIP} ]] && [[ $(sha1sum ${MODEL_ZIP}) == "${MODEL_HASH}" ]]; th fi else # Download model - echo "Downloading latest model from $MODEL_URL…" + echo "Downloading latest model from $MODEL_URL..." wget --inet4-only -c "${MODEL_URL}" -O ${MODEL_ZIP} TMP_HASH=$(sha1sum ${MODEL_ZIP}) diff --git a/scripts/download-nsfw.sh b/scripts/download-nsfw.sh index 34bcd18b6..9875b4b02 100755 --- a/scripts/download-nsfw.sh +++ b/scripts/download-nsfw.sh @@ -10,7 +10,7 @@ MODEL_HASH="2e03ad3c6aec27c270c650d0574ff2a6291d992b $MODEL_ZIP" MODEL_VERSION="$MODEL_PATH/version.txt" MODEL_BACKUP="storage/backup/nsfw-$TODAY" -echo "Installing $MODEL_NAME model for TensorFlow…" +echo "Installing $MODEL_NAME model for TensorFlow..." # Create directories mkdir -p /tmp/photoprism @@ -24,7 +24,7 @@ if [[ -f ${MODEL_ZIP} ]] && [[ $(sha1sum ${MODEL_ZIP}) == "${MODEL_HASH}" ]]; th fi else # Download model - echo "Downloading latest model from $MODEL_URL…" + echo "Downloading latest model from $MODEL_URL..." wget --inet4-only -c "${MODEL_URL}" -O ${MODEL_ZIP} TMP_HASH=$(sha1sum ${MODEL_ZIP}) diff --git a/scripts/gettext-clear-fuzzy.sh b/scripts/gettext-clear-fuzzy.sh index eb47e1013..8a8dfd4d7 100755 --- a/scripts/gettext-clear-fuzzy.sh +++ b/scripts/gettext-clear-fuzzy.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash -echo "Removing fuzzy attribute from backend translations…" +echo "Removing fuzzy attribute from backend translations..." for file in ./assets/locales/**/*.po; do msgattrib --clear-fuzzy -o "${file}" "${file}"; done -echo "Removing fuzzy attribute from frontend translations…" +echo "Removing fuzzy attribute from frontend translations..." for file in ./frontend/src/locales/*.po; do msgattrib --clear-fuzzy -o "${file}" "${file}"; done echo "Done." diff --git a/scripts/gettext-merge.sh b/scripts/gettext-merge.sh index 6225dfee3..36c817350 100755 --- a/scripts/gettext-merge.sh +++ b/scripts/gettext-merge.sh @@ -1,9 +1,9 @@ #!/usr/bin/env bash -echo "Merging backend translations…" +echo "Merging backend translations..." for file in ./assets/locales/**/*.po; do msgmerge --previous --no-fuzzy-matching --update "${file}" ./assets/locales/messages.pot; done -echo "Merging frontend translations…" +echo "Merging frontend translations..." for file in ./frontend/src/locales/*.po; do msgmerge --previous --no-fuzzy-matching --no-wrap --update "${file}" ./frontend/src/locales/translations.pot; done echo "Done." \ No newline at end of file