Explorar o código

Poprawienie kolejności instalowania rzeczy - najpierw dodatkowe moduły php z port, potem ixed (wcześniej nie ma katalogu z modułami)

Mariusz Muszyński %!s(int64=9) %!d(string=hai) anos
pai
achega
b1132d3fcd
Modificáronse 1 ficheiros con 21 adicións e 16 borrados
  1. 21 16
      SE/superedit-INSTALL_SES_PROCESY_A.php

+ 21 - 16
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -643,27 +643,12 @@ if($SERVER_VERSION=='10.9Maverick') $cmd[]['rsh']="gcc 2>&1 |grep 'no input file
 ';//  $cmd[]['rsh']='installer -package /tmp/MacPorts-2.2.0-10.8-MountainLion.pkg -target "'.$SERVER_MOUNT_POINT_ROOT.'" -verbose';
 	}
 
+
  $cmd[]['rsh']='xcode-select --install && '.tell_user_gui_error('zainstaluj komponenty XCODE i ponow instalacje').' && exit 1 || echo PASSED'; //@2015-11-01 - TODO do wytestowania a.binder
  $cmd[]['rsh']='mysql_ver=`port installed active 2>/dev/null|grep mysql55-server|awk "{print $2}"|cut -d "." -f 3|cut -d "_" -f 1`; if [ -z "${mysql_ver}" ]; then echo PASSED; else [ ${mysql_ver} -lt 48 ] && '.tell_user_gui_error('Dokonaj ręcznej aktualizacji bazy mysql zgodnie z krokiem procesu 5390 i ponów instalację.').' && exit 1 || echo PASSED; fi';
  $cmd[]['rsh']='port selfupdate || echo OK ';
  $cmd[]['rsh']='port upgrade outdated || echo "Nothing to upgrade"';
  $cmd[]['rsh']='port selfupdate';
-if($SERVER_VERSION=='10.9Maverick') $cmd[]['scp']=array('/Applications/SourceGuardian.app/Contents/Loaders/Mac\ OS\ X/ixed.5.4.dar','/usr/lib/php/extensions/no-debug-non-zts-20100525/');//  $cmd[]['rsh']='installer -package /tmp/MacPorts-2.2.0-10.8-MountainLion.pkg -target "'.$SERVER_MOUNT_POINT_ROOT.'" -verbose';
-if($SERVER_VERSION=='10.9Maverick') $cmd[]['rsh']='cat /etc/php.ini |grep "extension=ixed.5.4.dar" || echo "\nextension=ixed.5.4.dar\n" >> /etc/php.ini';
-
-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=/opt/local/lib/php55/extensions/no-debug-non-zts-20121212/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.12-Sierra') {
-    $cmd[]['scp']=array('/Applications/SourceGuardian.app/Contents/Loaders/Mac\ OS\ X/ixed.5.6.dar','/opt/local/lib/php56/extensions/no-debug-non-zts-20131226/');
-    $cmd[]['rsh']='cat /etc/php.ini |grep "extension=/opt/local/lib/php56/extensions/no-debug-non-zts-20131226/ixed.5.6.dar" || echo "\nextension=/opt/local/lib/php56/extensions/no-debug-non-zts-20131226/ixed.5.6.dar\n" >> /etc/php.ini';
-}
-
-$cmd[]['rsh']='serveradmin stop web && serveradmin start web';
 
 if($SERVER_VERSION=='10.10Yosemite') {
 	$cmd[]['rsh']='port install ImageMagick';
@@ -688,6 +673,26 @@ if($SERVER_VERSION=='10.12-Sierra') {
 	$cmd[]['rsh']='cat /etc/php.ini |grep "extension=/opt/local/lib/php56/extensions/no-debug-non-zts-20131226/imagick.so" || echo "\nextension=/opt/local/lib/php56/extensions/no-debug-non-zts-20131226/imagick.so\n" >> /etc/php.ini';
 }
 
+
+// Modul ixed do SourceGuardian
+if($SERVER_VERSION=='10.9Maverick') $cmd[]['scp']=array('/Applications/SourceGuardian.app/Contents/Loaders/Mac\ OS\ X/ixed.5.4.dar','/usr/lib/php/extensions/no-debug-non-zts-20100525/');//  $cmd[]['rsh']='installer -package /tmp/MacPorts-2.2.0-10.8-MountainLion.pkg -target "'.$SERVER_MOUNT_POINT_ROOT.'" -verbose';
+if($SERVER_VERSION=='10.9Maverick') $cmd[]['rsh']='cat /etc/php.ini |grep "extension=ixed.5.4.dar" || echo "\nextension=ixed.5.4.dar\n" >> /etc/php.ini';
+
+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=/opt/local/lib/php55/extensions/no-debug-non-zts-20121212/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.12-Sierra') {
+    $cmd[]['scp']=array('/Applications/SourceGuardian.app/Contents/Loaders/Mac\ OS\ X/ixed.5.6.dar','/opt/local/lib/php56/extensions/no-debug-non-zts-20131226/');
+    $cmd[]['rsh']='cat /etc/php.ini |grep "extension=/opt/local/lib/php56/extensions/no-debug-non-zts-20131226/ixed.5.6.dar" || echo "\nextension=/opt/local/lib/php56/extensions/no-debug-non-zts-20131226/ixed.5.6.dar\n" >> /etc/php.ini';
+}
+
+$cmd[]['rsh']='serveradmin stop web && serveradmin start web';
+
+
 //@2015-10-25 bindera: problemy po upgrade portow z niedzialajacym mysql - skip-networking- wykonanie instrukcji czyszczacych ten problem
 	$cmd[]['rsh']='cat /opt/local/etc/mysql55/macports-default.cnf |grep "skip-networking" |grep -v "#" && (
 	sed -i.bak "s/skip-networking/#skip-networking/"  /opt/local/etc/mysql55/macports-default.cnf