diff --git a/.gitattributes b/.gitattributes index e916743..ab51753 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,7 @@ * text eol=lf +*.csv text eol=auto +*.txt text eol=auto +*.md text eol=auto *.sh text eol=lf *.bat text eol=crlf *.cmd text eol=crlf diff --git a/Pipfile.lock b/Pipfile.lock index a5b0305..3ace113 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -514,10 +514,10 @@ }, "nuitka": { "hashes": [ - "sha256:06b020ef33be97194f888dcfcd4c69c8452ceb61b31c7622e610d5156eb7923d" + "sha256:a648c392d2a041f31c9582a68ef7c1a3a71166eaf2d344a0bb1d03f184ed3a2a" ], "index": "pypi", - "version": "==2.8.4" + "version": "==2.8.6" }, "ordered-set": { "hashes": [ diff --git a/README.md b/README.md index c1839ce..65a0d08 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![CI tests](https://github.com/scito/extract_otp_secrets/actions/workflows/ci.yml/badge.svg)](https://github.com/scito/extract_otp_secrets/actions/workflows/ci.yml) [![CI docker](https://github.com/scito/extract_otp_secrets/actions/workflows/ci_docker.yml/badge.svg)](https://github.com/scito/extract_otp_secrets/actions/workflows/ci_docker.yml) -![coverage](https://img.shields.io/badge/coverage-95%25-brightgreen) +![coverage](https://img.shields.io/badge/coverage-92%25-brightgreen) [![License](https://img.shields.io/github/license/scito/extract_otp_secrets)](https://github.com/scito/extract_otp_secrets/blob/master/LICENSE) [![GitHub release (latest SemVer)](https://img.shields.io/github/v/release/scito/extract_otp_secrets?sort=semver)](https://github.com/scito/extract_otp_secrets/releases/latest) ![python versions](https://img.shields.io/badge/python-3.9%20%7C%203.10%20%7C%203.11%20%7C%203.12%20%7C%203.13%20%7C%203.14-blue) @@ -702,7 +702,7 @@ PYTHON=python3.11 PIP=pip3.11 DOCKER="podman" ./build.sh -d ``` Git for Windows: ```bash -MSYS_NO_PATHCONV=1 DOCKER="podman" ./build.sh -d +MSYS_NO_PATHCONV=1 NOINHERIT=1 DOCKER="podman" ./build.sh -d ``` The options of the build script: diff --git a/build.sh b/build.sh index 738d546..334cc91 100755 --- a/build.sh +++ b/build.sh @@ -397,7 +397,11 @@ if $build_local; then $PIPENV --version - cmd="rm Pipfile.lock || true; $PIPENV --rm || true" + cmd="rm Pipfile.lock || echo 'No Pipfile.lock to remove'" + if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi + eval "$cmd" + + cmd="# $PIPENV --rm || echo 'No virtualenv to remove'" if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi eval "$cmd" @@ -498,8 +502,7 @@ if $build_local; then fi # Generate README.md TOC - - cmd="gfm-toc -s 2 -e 3 -t -o README.md > docs/README_TOC.md" + cmd="env -u MSYS_NO_PATHCONV gfm-toc -s 2 -e 3 -t -o README.md > docs/README_TOC.md" if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi eval "$cmd" @@ -509,7 +512,7 @@ if $build_local; then eval "$cmd" # create macOS extract_otp_secrets_macos.spec from extract_otp_secrets_macos_template.spec - cmd="VERSION_STR=$(setuptools-git-versioning) COPYRIGHT_YEARS='2020-2023' envsubst < installer/extract_otp_secrets_macos_template.spec > build/extract_otp_secrets_macos.spec" + cmd="VERSION_STR=$(setuptools-git-versioning) COPYRIGHT_YEARS='2020-$(date +%Y)' envsubst < installer/extract_otp_secrets_macos_template.spec > build/extract_otp_secrets_macos.spec" if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi eval "$cmd" fi