Skip to content
This repository was archived by the owner on Nov 13, 2023. It is now read-only.

Commit ae47d7a

Browse files
committed
Download from new git sources folder
Fetch man-pages from git-manpages repository
1 parent ed835fa commit ae47d7a

File tree

4 files changed

+17
-7
lines changed

4 files changed

+17
-7
lines changed

.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "git-manpages"]
2+
path = git-manpages
3+
url = http://git.kernel.org/pub/scm/git/git-manpages.git

build.sh

+12-6
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ $SUDO mv $PREFIX{,_`date +%s`} || echo "Git not installed currently"
1515

1616
mkdir -p git_build
1717

18-
DOWNLOAD_LOCATION="http://git-core.googlecode.com/files"
19-
2018
export CFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch i386 -arch x86_64"
2119
export LDFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK_PATH -arch i386 -arch x86_64"
2220

@@ -25,7 +23,7 @@ export CPLUS_INCLUDE_PATH=/usr/include
2523
export LD_LIBRARY_PATH=/usr/lib
2624

2725
pushd git_build
28-
[ ! -f git-$GIT_VERSION.tar.gz ] && curl -O $DOWNLOAD_LOCATION/git-$GIT_VERSION.tar.gz
26+
[ ! -f git-$GIT_VERSION.tar.gz ] && curl https://codeload.github.com/git/git/tar.gz/v${GIT_VERSION} > git-$GIT_VERSION.tar.gz
2927
[ ! -d git-$GIT_VERSION ] && tar zxvf git-$GIT_VERSION.tar.gz
3028
pushd git-$GIT_VERSION
3129

@@ -48,10 +46,18 @@ pushd git_build
4846
popd
4947
popd
5048

51-
git_man_archive=git-manpages-$GIT_VERSION.tar.gz
52-
[ ! -f $git_man_archive ] && curl -O $DOWNLOAD_LOCATION/$git_man_archive
49+
GIT_MANPAGES_FOLDER="../git-manpages/.git"
50+
echo "-----------------------"
51+
echo
52+
echo "Please ensure that the folder `pwd`/$GIT_MANPAGES_FOLDER is at version $GIT_VERSION"
53+
printf "Press enter:"
54+
read
55+
echo
5356
$SUDO mkdir -p $PREFIX/share/man
54-
if ( ! $SUDO tar xzvo -C $PREFIX/share/man -f $git_man_archive ); then
57+
GIT_MANPAGES_ARCHIVE=git-manpages-$GIT_VERSION.tar.gz
58+
git archive --format=tar --remote $GIT_MANPAGES_FOLDER HEAD | gzip > $GIT_MANPAGES_ARCHIVE
59+
echo "sudo tar xf <(git archive --format=tar --remote $GIT_MANPAGES_FOLDER HEAD) -C $PREFIX/share/man"
60+
if ( ! sudo tar xzf $GIT_MANPAGES_ARCHIVE -C $PREFIX/share/man ); then
5561
echo "Error extracting manpages!!! Maybe download location has changed / failed? Look at `pwd`/$git_man_archive. Remove it and re-run build to attempt redownload."
5662
exit 1
5763
fi

build_package_test_and_bundle.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ set -e -o pipefail
88
rm -f Disk\ Image/*.pkg
99

1010
if [ "`uname`" == "Darwin" ]; then sed_regexp="-E"; else sed_regexp="-r"; fi
11-
GIT_VERSION="${1:-`curl http://git-scm.com/ 2>&1 | grep "<span class='version'>" | sed $sed_regexp 's/^.+>([0-9.]+)<.+$/\1/'`}"
11+
GIT_VERSION="${1:-`curl http://git-scm.com/ 2>&1 | grep '<span class="version">' -A 1 | tail -n 1 | sed $sed_regexp 's/ *//'`}"
1212

1313
./build.sh $GIT_VERSION
1414

git-manpages

Submodule git-manpages added at 8e0f4d7

0 commit comments

Comments
 (0)