Git: Use sysconfdir=/etc for git built from source (#395)
* Git: Adds a new 'addGitConfigSymlink' option * Use sysconfdir
This commit is contained in:
parent
e67f4dc0fd
commit
74dd2710dc
3 changed files with 10 additions and 2 deletions
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"id": "git",
|
||||
"version": "1.1.3",
|
||||
"version": "1.1.4",
|
||||
"name": "Git (from source)",
|
||||
"documentationURL": "https://github.com/devcontainers/features/tree/main/src/git",
|
||||
"description": "Install an up-to-date version of Git, built from source as needed. Useful for when you want the latest and greatest features. Auto-detects latest stable version and installs needed dependencies.",
|
||||
|
|
|
@ -144,7 +144,7 @@ echo "Downloading source for ${GIT_VERSION}..."
|
|||
curl -sL https://github.com/git/git/archive/v${GIT_VERSION}.tar.gz | tar -xzC /tmp 2>&1
|
||||
echo "Building..."
|
||||
cd /tmp/git-${GIT_VERSION}
|
||||
make -s USE_LIBPCRE=YesPlease prefix=/usr/local all && make -s USE_LIBPCRE=YesPlease prefix=/usr/local install 2>&1
|
||||
make -s USE_LIBPCRE=YesPlease prefix=/usr/local sysconfdir=/etc all && make -s USE_LIBPCRE=YesPlease prefix=/usr/local sysconfdir=/etc install 2>&1
|
||||
rm -rf /tmp/git-${GIT_VERSION}
|
||||
rm -rf /var/lib/apt/lists/*
|
||||
echo "Done!"
|
||||
|
|
|
@ -12,5 +12,13 @@ cd /tmp && git clone https://github.com/devcontainers/feature-starter.git
|
|||
cd feature-starter
|
||||
check "perl" bash -c "git -c grep.patternType=perl grep -q 'a.+b'"
|
||||
|
||||
check "git-location" bash -c "which git | grep /usr/local/bin/git"
|
||||
|
||||
check "set-git-config-user-name" bash -c "git config --system user.name devcontainers"
|
||||
check "gitconfig-file-location" bash -c "ls /etc/gitconfig"
|
||||
check "gitconfig-contains-name" bash -c "cat /etc/gitconfig | grep 'name = devcontainers'"
|
||||
|
||||
check "usr-local-etc-config-does-not-exist" test ! -f "/usr/local/etc/gitconfig"
|
||||
|
||||
# Report result
|
||||
reportResults
|
||||
|
|
Loading…
Reference in a new issue