Merge branch 'master' of biuro.biall-net.pl:plabudda/se

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -609,6 +609,10 @@ if($SERVER_VERSION=='10.9Maverick') $cmd[]['rsh']="gcc 2>&1 |grep 'no input file
  	 	 $cmd[]['scp']=array('/Library/Server/Web/Data/Sites/Default/SE/se-dev-pl/stuff/MacPorts-2.3.3-10.10-Yosemite.pkg','/tmp/MacPorts-2.3.3-10.10-Yosemite.pkg');
 	 	 $cmd[]['rsh']='installer -package /tmp/MacPorts-2.3.3-10.10-Yosemite.pkg -target "/" -verbose';
 
+ 	} else if($SERVER_VERSION=='10.11-ElCapitan') {
+ 	 	 $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/MacPorts-2.3.4-10.11-ElCapitan.pkg','/tmp/MacPorts-2.3.4-10.11-ElCapitan.pkg');
+	 	 $cmd[]['rsh']='installer -package /tmp/MacPorts-2.3.4-10.11-ElCapitan.pkg -target "/" -verbose';
+
  	} else {
 
 	 	 $cmd[]['scp']=array('/Library/Server/Web/Data/Sites/Default/SE/se-dev-pl/stuff/MacPorts-2.3.2-10.9-Mavericks.pkg','/tmp/MacPorts-2.3.2-10.9-Mavericks.pkg');
@@ -626,6 +630,11 @@ if($SERVER_VERSION=='10.9Maverick') $cmd[]['rsh']='cat /etc/php.ini |grep "exten
 if($SERVER_VERSION=='10.10Yosemite') $cmd[]['scp']=array('/Applications/SourceGuardian.app/Contents/Loaders/Mac\ OS\ X/ixed.5.5.dar','/usr/lib/php/extensions/no-debug-non-zts-20121212/');//  $cmd[]['rsh']='installer -package /tmp/MacPorts-2.2.0-10.8-MountainLion.pkg -target "'.$SERVER_MOUNT_POINT_ROOT.'" -verbose';
 if($SERVER_VERSION=='10.10Yosemite') $cmd[]['rsh']='cat /etc/php.ini |grep "extension=ixed.5.5.dar" || echo "\nextension=ixed.5.5.dar\n" >> /etc/php.ini';
 
+
+if($SERVER_VERSION=='10.11-ElCapitan') $cmd[]['scp']=array('/Applications/SourceGuardian.app/Contents/Loaders/Mac\ OS\ X/ixed.5.5.dar','/opt/local/lib/php55/extensions/no-debug-non-zts-20121212/');//  $cmd[]['rsh']='installer -package /tmp/MacPorts-2.2.0-10.8-MountainLion.pkg -target "'.$SERVER_MOUNT_POINT_ROOT.'" -verbose';
+if($SERVER_VERSION=='10.11-ElCapitan') $cmd[]['rsh']='cat /etc/php.ini |grep "extension=ixed.5.5.dar" || echo "\nextension=/opt/local/lib/php55/extensions/no-debug-non-zts-20121212/ixed.5.5.dar\n" >> /etc/php.ini';
+
+
 if($SERVER_VERSION=='10.10Yosemite') {
 	$cmd[]['rsh']='port install ImageMagick';
 	$cmd[]['rsh']='port install php55-imagick';
@@ -634,6 +643,13 @@ if($SERVER_VERSION=='10.10Yosemite') {
 	$cmd[]['rsh']='cat /etc/php.ini |grep "extension=imagick.so" || echo "\nextension=imagick.so\n" >> /etc/php.ini';
 }
 
+if($SERVER_VERSION=='10.11-ElCapitan') {
+	$cmd[]['rsh']='port install ImageMagick';
+	$cmd[]['rsh']='port install php55-imagick';
+	$cmd[]['rsh']='port install php55-imagick';
+//	$cmd[]['rsh']='ls -al /opt/local/lib/php55/extensions/no-debug-non-zts-20121212/imagick.so || cd /opt/local/lib/php55/extensions/no-debug-non-zts-20121212/ && ln -s /opt/local/lib/php55/extensions/no-debug-non-zts-20121212/imagick.so . ';
+	$cmd[]['rsh']='cat /etc/php.ini |grep "extension=imagick.so" || echo "\nextension=/opt/local/lib/php55/extensions/no-debug-non-zts-20121212/imagick.so\n" >> /etc/php.ini';
+}
 
 
 //EOF TO MOVE TO INSTALL_GETCOMMANDS_COMP_PORT_MYSQL
@@ -2060,8 +2076,8 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.COMP_PORT']['installer_tmp']="/tmp/pl.procesy5_COMP_PORT_".$h->ID.".".$h->SERVER_ADDRESS;  //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.COMP_PORT']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_COMP_PORT"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.COMP_PORT']['xml_choice']['visible']='true';
-		$packages['pl.procesy5.COMP_PORT']['xml_choice']['title']='MacPorts,Xcode,Licence';	
-		$packages['pl.procesy5.COMP_PORT']['xml_choice']['description']='Needed utilities and libraries to install Procesy5 and Database';			
+		$packages['pl.procesy5.COMP_PORT']['xml_choice']['title']='MacPorts,Xcode,Licence(decrypt)';	
+		$packages['pl.procesy5.COMP_PORT']['xml_choice']['description']='Needed utilities and libraries to install Procesy5 and Database, decrypt';			
 		$packages['pl.procesy5.COMP_PORT']['xml_choice']['start_selected']='true';	
 
 		$packages['pl.procesy5.MYSQL55']['exit_file']=str_replace('.', '_', $h->ID.".MYSQL55_".$h->SERVER_ADDRESS); //czesc nazwy wynikowego pliku .pkg
@@ -2080,7 +2096,7 @@ function INSTALL_SES_PROCESY_A() {
 		$packages['pl.procesy5.POSTGIS']['CMD_FUNCTION']="INSTALL_GETCOMMANDS_POSTGIS"; //miejsce do ktorego installer odpakuje wszystko instalator
 		$packages['pl.procesy5.POSTGIS']['xml_choice']['visible']='true';
 		$packages['pl.procesy5.POSTGIS']['xml_choice']['title']='Postgres-postgis';	
-		$packages['pl.procesy5.POSTGIS']['xml_choice']['description']='Required Postgis database for qGIS ';			
+		$packages['pl.procesy5.POSTGIS']['xml_choice']['description']='Required Postgis database for qGIS';			
 		$packages['pl.procesy5.POSTGIS']['xml_choice']['start_selected']='true';