|
7 | 7 |
|
8 | 8 | P4WHENCE=https://cdist2.perforce.com/perforce/r21.2
|
9 | 9 | LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
|
10 |
| -UBUNTU_COMMON_PKGS="make libssl-dev libcurl4-openssl-dev libexpat-dev |
11 |
| - tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl |
12 |
| - libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl" |
13 | 10 |
|
14 | 11 | # Make sudo a no-op and execute the command directly when running as root.
|
15 | 12 | # While using sudo would be fine on most platforms when we are root already,
|
|
25 | 22 | case "$distro" in
|
26 | 23 | ubuntu-*)
|
27 | 24 | sudo apt-get -q update
|
28 |
| - sudo apt-get -q -y install language-pack-is libsvn-perl apache2 \ |
29 |
| - $UBUNTU_COMMON_PKGS $CC_PACKAGE $PYTHON_PACKAGE |
| 25 | + sudo apt-get -q -y install \ |
| 26 | + language-pack-is libsvn-perl apache2 \ |
| 27 | + make libssl-dev libcurl4-openssl-dev libexpat-dev \ |
| 28 | + tcl tk gettext zlib1g-dev perl-modules liberror-perl libauthen-sasl-perl \ |
| 29 | + libemail-valid-perl libio-socket-ssl-perl libnet-smtp-ssl-perl \ |
| 30 | + $CC_PACKAGE $PYTHON_PACKAGE |
| 31 | + |
30 | 32 | mkdir --parents "$P4_PATH"
|
31 | 33 | pushd "$P4_PATH"
|
32 | 34 | wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
|
33 | 35 | wget --quiet "$P4WHENCE/bin.linux26x86_64/p4"
|
34 | 36 | chmod u+x p4d
|
35 | 37 | chmod u+x p4
|
36 | 38 | popd
|
| 39 | + |
37 | 40 | mkdir --parents "$GIT_LFS_PATH"
|
38 | 41 | pushd "$GIT_LFS_PATH"
|
39 | 42 | wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
|
@@ -83,10 +86,6 @@ Documentation)
|
83 | 86 | test -n "$ALREADY_HAVE_ASCIIDOCTOR" ||
|
84 | 87 | sudo gem install --version 1.5.8 asciidoctor
|
85 | 88 | ;;
|
86 |
| -linux-gcc-default) |
87 |
| - sudo apt-get -q update |
88 |
| - sudo apt-get -q -y install $UBUNTU_COMMON_PKGS |
89 |
| - ;; |
90 | 89 | esac
|
91 | 90 |
|
92 | 91 | if type p4d >/dev/null 2>&1 && type p4 >/dev/null 2>&1
|
|
0 commit comments