Skip to content

Commit 3b76610

Browse files
committed
Improved hardcoded paths
1 parent 13c63c0 commit 3b76610

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

tools/git/Dockerfile.template

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,25 @@ EOF
4040
RUN <<EOF
4141
export CFLAGS="${CFLAGS} -static"
4242
make configure
43-
./configure --prefix="${prefix}"
43+
./configure \
44+
--prefix="/usr/local" \
45+
--sysconfdir="/etc"
4446
make -j$(nproc) all
4547
make -j$(nproc) doc
46-
make install install-doc install-html
48+
make install install-doc install-html DESTDIR="${prefix}"
4749
EOF
4850
RUN <<EOF
4951
make -C contrib/subtree
50-
make -C contrib/subtree install
52+
make -C contrib/subtree install DESTDIR="${prefix}"
5153

5254
make -C contrib/diff-highlight
5355
install -Dm755 contrib/diff-highlight/diff-highlight -t "${prefix}/bin/"
5456

55-
#make -C contrib/credential/libsecret
56-
#install -Dm755 contrib/credential/libsecret/git-credential-libsecret "${prefix}/libexec/git-core/"
57-
58-
install -Dm644 contrib/completion/git-completion.bash "${prefix}/usr/share/bash-completion/completions/git"
57+
install -Dm644 contrib/completion/git-completion.bash "${prefix}/share/bash-completion/completions/git"
5958
install -Dm644 contrib/completion/git-prompt.sh "${prefix}/share/git-core/git-prompt.sh"
59+
EOF
60+
WORKDIR /uniget_bootstrap
61+
RUN <<EOF
62+
cp -r usr/local/* .
63+
rm -rf usr/local
6064
EOF

tools/git/manifest.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,14 @@ tags:
1616
homepage: https://git-scm.com/
1717
repository: https://github.com/git/git
1818
description: Distributed version control system
19+
messages:
20+
internals: |
21+
git has multiple paths compiled in:
22+
- GIT_EXEC_PATH defaults to /usr/local/libexec/git-core
23+
- GIT_TEMPLATE_DIR defaults to /usr/local/share/git-core/templates
24+
- Global configuration files are expected to live in /etc/git{attributes,config}
25+
26+
You con override them by setting the approprivate environment variables. Please refer to the official documentation: https://git-scm.com/docs
1927
renovate:
2028
datasource: github-tags
2129
package: git/git

0 commit comments

Comments
 (0)