Merge pull request #4 from jeedom/master

bugfix
jeedom · Sep 27, 2017 · 6bdf401 · 6bdf401
2 parents 90576c7 + f615135
commit 6bdf401
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/core/class/camera.class.php b/core/class/camera.class.php
@@ -88,7 +88,10 @@ public static function dependancy_info() {
 		if (exec('which avconv | wc -l') == 0) {
 			$return['state'] = 'nok';
 		}
-		if (exec(system::getCmdSudo() . system::get('cmd_check') . '-E "python\-imaging" | wc -l') != 1) {
+		if (exec(system::getCmdSudo() . system::get('cmd_check') . '-E "python\-imaging" | wc -l') == 0) {
+			$return['state'] = 'nok';
+		}
+		if (exec(system::getCmdSudo() . system::get('cmd_check') . '-E "php(.*)gd" | wc -l') == 0) {
 			$return['state'] = 'nok';
 		}
 		return $return;

diff --git a/resources/install_apt.sh b/resources/install_apt.sh
@@ -8,6 +8,12 @@ echo "Launch install of camera dependancy"
 sudo apt-get update
 echo 50 > ${PROGRESS_FILE}
 sudo apt-get install -y libav-tools python-imaging
+echo 80 > ${PROGRESS_FILE}
+sudo apt-get install -y php5-gd
+echo 90 > ${PROGRESS_FILE}
+sudo apt-get install -y php7.0-gd
+echo 95 > ${PROGRESS_FILE}
+sudo systemctl restart apache2
 echo 100 > ${PROGRESS_FILE}
 echo "Everything is successfully installed!"
 rm ${PROGRESS_FILE}