Merge branch 'phantomjs2' into 'master'

Phantomjs2



See merge request !11

scripts/install-essentials

@@ -11,7 +11,10 @@ apt-get install -y \
 	libxslt-dev libcurl4-openssl-dev libicu-dev \
 	logrotate python-docutils pkg-config cmake nodejs \
 	libkrb5-dev postgresql-client mysql-client unzip \
-	$PACKAGES
+
+echo deb http://httpredir.debian.org/debian stretch main > /etc/apt/sources.list
+apt-get update -yqqq
+apt-get install -yqq --force-yes git
 
 # Set UTF-8
 # http://stackoverflow.com/a/3182519/2137281

scripts/install-git

@@ -1,15 +0,0 @@
-#!/bin/bash
-
-set -xeo pipefail
-
-cd /tmp
-wget https://www.kernel.org/pub/software/scm/git/git-2.7.4.tar.gz
-echo '7104c4f5d948a75b499a954524cb281fe30c6649d8abe20982936f75ec1f275b  git-2.7.4.tar.gz' | shasum -a256 -c -
-tar -xzf git-2.7.4.tar.gz
-
-cd git-2.7.4/
-./configure
-make prefix=/usr/local all
-
-cd /
-rm -rf /tmp/*

scripts/install-phantomjs

@@ -3,6 +3,9 @@
 set -xeo pipefail
 
 cd /tmp
-wget -q https://gitlab.com/axil/phantomjs-debian/raw/master/phantomjs_1.9.8-0jessie_amd64.deb
-dpkg -i phantomjs_1.9.8-0jessie_amd64.deb
-rm /tmp/*
+
+PHANTOMJS_VERSION=${1:-1.9.8}
+PHANTOMJS_FILE="phantomjs-$PHANTOMJS_VERSION-linux-x86_64"
+curl -L "https://bitbucket.org/ariya/phantomjs/downloads/$PHANTOMJS_FILE.tar.bz2" | tar jx
+cp "$PHANTOMJS_FILE/bin/phantomjs" "/usr/bin/"
+rm -rf /tmp/*