Change installation of Wkhtmltopdf

This commit is contained in:
Michael RICOIS 2016-06-20 15:42:20 +02:00
parent 69e57c3e6b
commit f9c8297991
2 changed files with 8 additions and 6 deletions

View File

@ -4,8 +4,8 @@ VARGANTDEV=1
DIR=/vagrant
DIRDATA=$DIR/data
MYSQL_PASS=scores
MARIADB_VERSION="10.1"
PHPMYADMIN_VERSION="4.6.1"
MARIADB_VERSION="10.1"
PHPMYADMIN_VERSION="4.6.1"
# --- Add a file action.upgrade to perfom a system upgrade
if [ -f $DIR/action.upgrade ]
@ -18,8 +18,10 @@ fi
# --- Installation Wkhtmltopdf
if [ ! -f /usr/local/bin/wkhtmltopdf ]
then
sudo dpkg -i $DIRDATA/Apps/wkhtmltox-0.12.2.1_linux-trusty-amd64.deb
sudo apt-get -f install -y
wget -q http://download.gna.org/wkhtmltopdf/0.12/0.12.3/wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
tar xJf wkhtmltox-0.12.3_linux-generic-amd64.tar.xz
cp -R wkhtmltox/* /usr/local/
rm -rf wkhtmltox*
fi
# --- Database
@ -150,8 +152,8 @@ for f in *.conf; do
done;
# --- phpmyadmin.sd.dev
cp -f $DIRDATA/Apache/phpmyadmin.conf $DIR/vhosts/phpmyadmin.conf
sed -i -e "s/VERSION/$PHPMYADMIN_VERSION/" $DIR/vhosts/phpmyadmin.conf
cp -f $DIRDATA/Apache/phpmyadmin.conf $DIR/vhosts/phpmyadmin.conf
sed -i -e "s/VERSION/$PHPMYADMIN_VERSION/" $DIR/vhosts/phpmyadmin.conf
# --- test.sd.dev
cp -f $DIRDATA/Apache/test.conf $DIR/vhosts/test.conf