Skip to content

Commit 1be8e4e

Browse files
committed
fix: git for win changes
1 parent 3d0be22 commit 1be8e4e

File tree

4 files changed

+14
-8
lines changed

4 files changed

+14
-8
lines changed

.gitattributes

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
* text eol=lf
2+
*.csv text eol=auto
3+
*.txt text eol=auto
4+
*.md text eol=auto
25
*.sh text eol=lf
36
*.bat text eol=crlf
47
*.cmd text eol=crlf

Pipfile.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![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)
44
[![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)
5-
![coverage](https://img.shields.io/badge/coverage-95%25-brightgreen)
5+
![coverage](https://img.shields.io/badge/coverage-92%25-brightgreen)
66
[![License](https://img.shields.io/github/license/scito/extract_otp_secrets)](https://github.com/scito/extract_otp_secrets/blob/master/LICENSE)
77
[![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)
88
![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
702702
```
703703
Git for Windows:
704704
```bash
705-
MSYS_NO_PATHCONV=1 DOCKER="podman" ./build.sh -d
705+
MSYS_NO_PATHCONV=1 NOINHERIT=1 DOCKER="podman" ./build.sh -d
706706
```
707707

708708
The options of the build script:

build.sh

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,11 @@ if $build_local; then
397397

398398
$PIPENV --version
399399

400-
cmd="rm Pipfile.lock || true; $PIPENV --rm || true"
400+
cmd="rm Pipfile.lock || echo 'No Pipfile.lock to remove'"
401+
if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
402+
eval "$cmd"
403+
404+
cmd="# $PIPENV --rm || echo 'No virtualenv to remove'"
401405
if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
402406
eval "$cmd"
403407

@@ -498,8 +502,7 @@ if $build_local; then
498502
fi
499503

500504
# Generate README.md TOC
501-
502-
cmd="gfm-toc -s 2 -e 3 -t -o README.md > docs/README_TOC.md"
505+
cmd="env -u MSYS_NO_PATHCONV gfm-toc -s 2 -e 3 -t -o README.md > docs/README_TOC.md"
503506
if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
504507
eval "$cmd"
505508

@@ -509,7 +512,7 @@ if $build_local; then
509512
eval "$cmd"
510513

511514
# create macOS extract_otp_secrets_macos.spec from extract_otp_secrets_macos_template.spec
512-
cmd="VERSION_STR=$(setuptools-git-versioning) COPYRIGHT_YEARS='2020-2023' envsubst < installer/extract_otp_secrets_macos_template.spec > build/extract_otp_secrets_macos.spec"
515+
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"
513516
if $interactive ; then askContinueYn "$cmd"; else echo -e "${cyan}$cmd${reset}";fi
514517
eval "$cmd"
515518
fi

0 commit comments

Comments
 (0)