From 02433c105bf281eeafee7ed0dc870fa54568fe36 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Wed, 12 Aug 2015 10:36:56 +0200
Subject: [PATCH 1/6] add php5-cli as dependance

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

diff --git a/scripts/install b/scripts/install
index f7d0348..f31451d 100644
--- a/scripts/install
+++ b/scripts/install
@@ -36,7 +36,7 @@ sudo yunohost app initdb $db_user -p $db_pwd
 sudo yunohost app setting movim mysqlpwd -v $db_pwd
 
 # Install packages
-sudo apt-get install php5-gd php5-curl php5-imagick -y
+sudo apt-get install php5-gd php5-curl php5-imagick php5-cli -y
 
 # Install Movim files
 final_path=/var/www/movim

From 41b9faf956afdc97161baf4ce67f1651f62443cc Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Wed, 12 Aug 2015 10:58:06 +0200
Subject: [PATCH 2/6] Change init detection

---
 README.md       | 6 ++++++
 TODO            | 2 +-
 scripts/install | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b009351..a9c92a9 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,12 @@ Current Movim version : 20150810.
 
 **Changelog**
 
+0.2b 2015-08-12
+- Add php5-cli as required
+
+0.1b 2015-08-12
+- Beta release
+
 **Installation**
 
     yunohost app install https://github.com/src386/movim_ynh
diff --git a/TODO b/TODO
index ec038b5..c92d4c1 100644
--- a/TODO
+++ b/TODO
@@ -1 +1 @@
-- URL rewriting
+- Add SSO support
diff --git a/scripts/install b/scripts/install
index f31451d..c27a8d6 100644
--- a/scripts/install
+++ b/scripts/install
@@ -66,7 +66,8 @@ sudo yunohost app addaccess movim -u $admin
 sudo sed -i "s@YHURL@$domain$path@g" ../conf/movim.{service,init}
 sudo sed -i "s@YHDIR@$final_path@g" ../conf/movim.{service,init}
 sudo sed -i "s@YHPORT@$port@g" ../conf/movim.{service,init}
-if [ `pgrep -ox systemd` = "1" ];
+initcheck=`pgrep -ox systemd`
+if [ "$initcheck" = "1" ];
 then
 	sudo cp ../conf/movim.service /lib/systemd/system/
 	sudo systemctl enable movim.service

From df41e0c66b7b78a7585d6a4f02cfb35b8af3d7bd Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Wed, 12 Aug 2015 10:59:30 +0200
Subject: [PATCH 3/6] fixed warning for sysvinit script install

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index a9c92a9..dcd1594 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,7 @@ Current Movim version : 20150810.
 
 0.2b 2015-08-12
 - Add php5-cli as required
+- Fixed a warning for sysvinit script installation
 
 0.1b 2015-08-12
 - Beta release

From 33a9ceb3f17661cddf4f4dde1fa3048188de13cb Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Wed, 12 Aug 2015 11:02:03 +0200
Subject: [PATCH 4/6] fix movim.init script

---
 conf/movim.init | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf/movim.init b/conf/movim.init
index c57aa91..b0e1556 100755
--- a/conf/movim.init
+++ b/conf/movim.init
@@ -1,6 +1,6 @@
 #!/bin/sh
 ### BEGIN INIT INFO
-# Provides:
+# Provides: movim
 # Required-Start:    $remote_fs $syslog 
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5

From 8ff79875a28de4acf5f60e37ae8f222e92cadb59 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Wed, 12 Aug 2015 11:02:43 +0200
Subject: [PATCH 5/6] fixed warning with sysvinit script

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index dcd1594..67daf41 100644
--- a/README.md
+++ b/README.md
@@ -13,6 +13,7 @@ Current Movim version : 20150810.
 0.2b 2015-08-12
 - Add php5-cli as required
 - Fixed a warning for sysvinit script installation
+- Fixed a LSB warning with movim sysvinit script
 
 0.1b 2015-08-12
 - Beta release

From b490ad3093add73e06356a96a77f64ab274c72f7 Mon Sep 17 00:00:00 2001
From: src386 <soyouz@src386.org>
Date: Wed, 12 Aug 2015 12:15:55 +0200
Subject: [PATCH 6/6] 0.2b

---
 TODO | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/TODO b/TODO
index 4985620..c92d4c1 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1 @@
-<<<<<<< HEAD
 - Add SSO support
-=======
->>>>>>> master