Przeglądaj źródła

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

Piotr Labudda 9 lat temu
rodzic
commit
076a506b50
1 zmienionych plików z 3 dodań i 1 usunięć
  1. 3 1
      SE/superedit-INSTALL_SES_PROCESY_A.php

+ 3 - 1
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -603,6 +603,8 @@ if($SERVER_VERSION=='10.9Maverick') $cmd[]['rsh']="gcc 2>&1 |grep 'no input file
 //@2014-10 really needed??? if($SERVER_VERSION=='10.8MountainLion') $cmd[]['scp']=array('/Library/Server/Web/Data/Sites/Default/SE/se-dev-pl/stuff/xcode462_cltools_10_86938259a.dmg','/tmp/xcode462_cltools_10_86938259a.dmg');
 //@2014-10 really needed??? if($SERVER_VERSION=='10.8MountainLion') $cmd[]['rsh']='hdiutil mount /tmp/xcode462_cltools_10_86938259a.dmg -mountpoint /Volumes/xcodetools';
 //@2014-10 really needed??? if($SERVER_VERSION=='10.8MountainLion') $cmd[]['rsh']='installer -package /Volumes/xcodetools/Com* -target "/" -verbose';//  $cmd[]['rsh']='installer -package /Volumes/xcodetools/Com* -target "'.$SERVER_MOUNT_POINT_ROOT.'" -verbose';
+	
+	//todo use sw_vers -productVersion -> shows 10.11.6 for elcapitain etc...
 	if($SERVER_VERSION=='10.8MountainLion') {
 		$cmd[]['scp']=array('/Library/Server/Web/Data/Sites/Default/SE/se-dev-pl/stuff/MacPorts-2.2.0-10.8-MountainLion.pkg','/tmp/MacPorts-2.2.0-10.8-MountainLion.pkg');
 		$cmd[]['rsh']='installer -package /tmp/MacPorts-2.2.0-10.8-MountainLion.pkg -target "/" -verbose';//  $cmd[]['rsh']='installer -package /tmp/MacPorts-2.2.0-10.8-MountainLion.pkg -target "'.$SERVER_MOUNT_POINT_ROOT.'" -verbose';
@@ -1086,7 +1088,7 @@ function INSTALL_GETCOMMANDS_WMS($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERN
 
 // mapserver
  $cmd[]['rsh']='port install mapserver >> /tmp/procesy5_install.log 2&>1 || echo PASSED'; //many times first time port install finishes with error - so do it twice as in tests!
- $cmd[]['rsh']='port install mapserver >> /tmp/procesy5_install.log 2&>1 ';
+ $cmd[]['rsh']='port install mapserver ';
 // qgis
  $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/qgis__kyngchaos.com/QGIS-2.14.3-1.dmg','/tmp/QGIS-2.14.3-1.dmg');
  $cmd[]['rsh']='hdiutil mount /tmp/QGIS-2.14.3-1.dmg -mountpoint /Volumes/QGIS-2.14.3-1';