From 118b88a92d04c4a2a8866d9890e7589bcb2eaf51 Mon Sep 17 00:00:00 2001
From: Kload <kload@kload.fr>
Date: Thu, 8 May 2014 09:57:31 +0200
Subject: [PATCH 1/2] [fix] PHP5 CLI dependency + sources in the git repo

---
 scripts/install | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/scripts/install b/scripts/install
index 1d14e73..2d92ea4 100644
--- a/scripts/install
+++ b/scripts/install
@@ -17,6 +17,9 @@ db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]'
 # Use 'mediawiki' as database name and user
 db_user=mediawiki
 
+# Instal php5-cli dependency
+sudo apt-get install php5-cli -y
+
 # Initialize database and store mysql password for upgrade
 sudo yunohost app initdb $db_user -p $db_pwd -s $(readlink -e ../conf/SQL/mysql.initial.sql)
 sudo yunohost app setting mediawiki mysqlpwd -v $db_pwd
@@ -24,19 +27,11 @@ sudo yunohost app setting mediawiki mysqlpwd -v $db_pwd
 # Copy files to the right place
 final_path=/var/www/mediawiki
 sudo mkdir -p $final_path
-sudo wget http://releases.wikimedia.org/mediawiki/1.22/mediawiki-1.22.6.tar.gz
-sudo tar xvzf mediawiki-*.tar.gz
-sudo mv mediawiki-*/* $final_path
-sudo rm -R mediawiki-*
+sudo cp ../sources/mediawiki/* $final_path
 sudo cp ../conf/LocalSettings.php $final_path/
 
 # LDAP Extension
-sudo wget https://codeload.github.com/wikimedia/mediawiki-extensions-LdapAuthentication/legacy.tar.gz/REL1_22
-sudo tar -xzf REL1_22
-sudo mkdir $final_path/extensions/LdapAuthentication
-sudo mv wikimedia-mediawiki-extensions-LdapAuthentication*/* $final_path/extensions/LdapAuthentication/
-sudo rm -R wikimedia-mediawiki-extensions-LdapAuthentication*
-sudo rm REL1_22
+sudo cp -r ../sources/LdapAuthentication $final_path/extensions/
 
 # Change variables in Mediawiki configuration
 sudo sed -i "s/ynh_wiki_name/$wiki_name/g" $final_path/LocalSettings.php
@@ -60,4 +55,4 @@ sudo cp ../conf/nginx.conf /etc/nginx/conf.d/$domain.d/mediawiki.conf
 
 # Reload Nginx and regenerate SSOwat conf
 sudo service nginx reload
-sudo yunohost app ssowatconf
\ No newline at end of file
+sudo yunohost app ssowatconf

From a26ce445d2f50dc7a556f7da20e3b715f5955222 Mon Sep 17 00:00:00 2001
From: Kload <kload@kload.fr>
Date: Thu, 8 May 2014 10:18:45 +0200
Subject: [PATCH 2/2] [fix] Update APT repo before dependency installation +
 copy directories

---
 scripts/install | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 2d92ea4..91591d3 100644
--- a/scripts/install
+++ b/scripts/install
@@ -18,6 +18,7 @@ db_pwd=$(dd if=/dev/urandom bs=1 count=200 2> /dev/null | tr -c -d '[A-Za-z0-9]'
 db_user=mediawiki
 
 # Instal php5-cli dependency
+sudo apt-get update
 sudo apt-get install php5-cli -y
 
 # Initialize database and store mysql password for upgrade
@@ -27,7 +28,7 @@ sudo yunohost app setting mediawiki mysqlpwd -v $db_pwd
 # Copy files to the right place
 final_path=/var/www/mediawiki
 sudo mkdir -p $final_path
-sudo cp ../sources/mediawiki/* $final_path
+sudo cp -r ../sources/mediawiki/* $final_path
 sudo cp ../conf/LocalSettings.php $final_path/
 
 # LDAP Extension