Skip to content

Commit

Permalink
Add osxkeychain to git
Browse files Browse the repository at this point in the history
  • Loading branch information
sodre committed Jan 20, 2019
1 parent 06ce330 commit 19a009a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
10 changes: 10 additions & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,20 @@ make \
NO_INSTALL_HARDLINKS=1 \
all strip install

# build osxkeychain
if [[ $(uname) == "Darwin" ]]; then
pushd contrib/credential/osxkeychain
make -e
cp -avf git-credential-osxkeychain $PREFIX/bin
popd
fi

git config --system http.sslVerify true
git config --system http.sslCAPath "${PREFIX}/ssl/cacert.pem"
git config --system http.sslCAInfo "${PREFIX}/ssl/cacert.pem"

# Install completion files
mkdir -p $PREFIX/share/bash-completion/completions
cp contrib/completion/git-completion.bash $PREFIX/share/bash-completion/completions/git


6 changes: 5 additions & 1 deletion recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ source:
sha256: 4c0fc0c77d577f8dbb3d7711283458ba1d0ce1781cfe0d49c940abbcdf18faa0 # [win64]

build:
number: 1000
number: 1001
# git hardcodes paths to external utilities (e.g. curl)
detect_binary_files_with_prefix: true

Expand Down Expand Up @@ -48,6 +48,7 @@ test:
# Verify git location.
- test -f $PREFIX/bin/git # [unix]
- test -f $PREFIX/bin/gitk # [unix]
- test -f $PREFIX/bin/git-credential-osxkeychain # [osx]
- if not exist %LIBRARY_PREFIX%\\bin\\git.exe exit 1 # [win]

# Verify interactive support.
Expand All @@ -57,6 +58,9 @@ test:
- git --version
- git clone https://github.com/conda-forge/git-feedstock

# Git credential commands
- git-credential-osxkeychain 2>&1 | grep -q usage # [osx]

# test completions
- bash $PREFIX/share/bash-completion/completions/git # [unix]
- conda inspect linkages -p $PREFIX $PKG_NAME # [not win]
Expand Down

0 comments on commit 19a009a

Please sign in to comment.