mirror of
https://github.com/scito/extract_otp_secret_keys.git
synced 2025-12-05 22:34:57 +01:00
fix: git for win changes
This commit is contained in:
parent
3d0be22e4a
commit
1be8e4ed1c
4 changed files with 14 additions and 8 deletions
3
.gitattributes
vendored
3
.gitattributes
vendored
|
|
@ -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
|
||||
|
|
|
|||
4
Pipfile.lock
generated
4
Pipfile.lock
generated
|
|
@ -514,10 +514,10 @@
|
|||
},
|
||||
"nuitka": {
|
||||
"hashes": [
|
||||
"sha256:06b020ef33be97194f888dcfcd4c69c8452ceb61b31c7622e610d5156eb7923d"
|
||||
"sha256:a648c392d2a041f31c9582a68ef7c1a3a71166eaf2d344a0bb1d03f184ed3a2a"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.8.4"
|
||||
"version": "==2.8.6"
|
||||
},
|
||||
"ordered-set": {
|
||||
"hashes": [
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
[](https://github.com/scito/extract_otp_secrets/actions/workflows/ci.yml)
|
||||
[](https://github.com/scito/extract_otp_secrets/actions/workflows/ci_docker.yml)
|
||||

|
||||

|
||||
[](https://github.com/scito/extract_otp_secrets/blob/master/LICENSE)
|
||||
[](https://github.com/scito/extract_otp_secrets/releases/latest)
|
||||

|
||||
|
|
@ -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:
|
||||
|
|
|
|||
11
build.sh
11
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue