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

SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -594,9 +594,9 @@ 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']=' port selfupdate';
- $cmd[]['rsh']=' port selfupdate';
-  $cmd[]['rsh']=' port upgrade outdated || echo "Nothing to upgrade"';
+ $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';
 
@@ -1215,6 +1215,8 @@ database=\"'.$REMOTE_FOLDER_ROOT.'\"
 
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-'.$SERVER_ADDRESS.'.ini.php
 ';
+
+$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_db-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
  //! .cnf--folders
  $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT;
  $cmd[]['rsh']=' mkdir -p /Library/Server/Web/Data/Sites/Default/PLIKI/'.$REMOTE_FOLDER_ROOT.'/PISMA';
@@ -1444,6 +1446,7 @@ www_share_point=\"SKANY\"
 
 
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$SERVER_ADDRESS.'.ini.php';
+$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--folders-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
 //! .config_domena_.php
 //LDAP 
 $cmd[]['rsh']='echo ";<?php
@@ -1458,6 +1461,7 @@ pass=\"'.$ADMIN_USERNAME_PASSWD.'\"
 base_dn=\"'.$SERVER_ADDRESS_LDAP_DC.'\"
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-'.$SERVER_ADDRESS.'.ini.php
 ';
+$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--default_ldap-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
 
 $cmd[]['rsh']='echo "<?php
 
@@ -1485,6 +1489,7 @@ database=\"SES_USERS2\"
 
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-'.$SERVER_ADDRESS.'.ini.php
 '; //todo zmienic to wczesniej
+$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--import_db-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
 
  $cmd[]['rsh']='which mysqladmin && mysqladmin  -f -uroot -p'.$ADMIN_USERNAME_PASSWD.' drop '.$REMOTE_FOLDER_ROOT.' || echo PASSED ';
 
@@ -1560,6 +1565,8 @@ database=\"'.$REMOTE_FOLDER_ROOT.'\"
 
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-'.$SERVER_ADDRESS.'.ini.php
 ';
+
+$cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-127.0.0.1.ini.php ||  ln /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-'.$SERVER_ADDRESS.'.ini.php /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-127.0.0.1.ini.php'; //aliasowanie do localhosta konfigow do testow systemu
 //! dodanie pierwszego usera ADMIN_USERNAME_L1 oraz diradmin
 
 return $cmd;
@@ -1569,14 +1576,18 @@ return $cmd;
 
 
 function INSTALL_GETCOMMANDS_MYADMIN($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNAME_PASSWD,$SERVER_MOUNT_POINT_ROOT,$SERVER_ADDRESS,$SERVER_ADDRESS_LDAP_DC,$SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$ADMIN_USERNAME_L1,$ADMIN_USERNAME_L1_PASS,$ADMIN_USERNAME_DIRECTORY,$ADMIN_USERNAME_INITIAL_PASSWD,$BACKUP_USB_DEVICE,$SERVER_VERSION,$OPTIONS) {
- $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz || echo PASSED';
+ $cmd[]['rsh']='test -f /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz || echo PASSED';
+ $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages || echo PASSED';
+
+ $cmd[]['rsh']='test -f /Library/Server/Web/Data/Sites/Default/phpMyAdmin.tar.gz && rm -R /Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz || echo PASSED';
+
  $cmd[]['rsh']='test -d /Library/Server/Web/Data/Sites/Default/garbage && rm -R /Library/Server/Web/Data/Sites/Default/garbage || echo PASSED';
 //! phpMyAdmin garbage
+ $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/phpMyAdmin-4.4.11-all-languages.tar.gz','/Library/Server/Web/Data/Sites/Default/phpMyAdmin-4.4.11-all-languages.tar.gz');
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/ || exit 1
- wget http://sourceforge.net/projects/phpmyadmin/files/phpMyAdmin/4.0.3/phpMyAdmin-4.0.3-all-languages.zip/download#\!md5\!4f71985c99e4e26e8b6b0b9165cafaad -O phpMyAdmin.tar.gz || exit 1 
- tar -zxpvf phpMyAdmin.tar.gz || exit 1 ';
+  tar -zxpvf phpMyAdmin-4.4.11-all-languages.tar.gz || exit 1';
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/ || exit 1
- mv phpMyAdmin-* garbage || exit 1 ';
+ mv phpMyAdmin-4.4.11-all-languages garbage || exit 1 ';
  $cmd[]['rsh']='cd /Library/Server/Web/Data/Sites/Default/garbage || exit 1 
 echo "<?
 \\$i = 0;