Jelajahi Sumber

fixed instalator: added VERSION file, create zasob 2 if missing

Piotr Labudda 10 tahun lalu
induk
melakukan
5814d2dded
1 mengubah file dengan 7 tambahan dan 5 penghapusan
  1. 7 5
      SE/superedit-INSTALL_SES_PROCESY_A.php

+ 7 - 5
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1188,6 +1188,7 @@ function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNA
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/procesy','/Library/Server/Web/Data/Sites/Default/SE/');
     $cmd[]['rsh']='rm -R /Library/Server/Web/Data/Sites/Default/SE/bash_sync_perms.php || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/bash_sync_perms.php','/Library/Server/Web/Data/Sites/Default/SE/');
+  $cmd[]['scp_root']=array($INSTALL_ROOT.'/VERSION','/Library/Server/Web/Data/Sites/Default/SE/');
 
 
 
@@ -1582,6 +1583,7 @@ $cmd[]['rsh']=' test -f /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--i
 
  $cmd[]['rsh']=' echo " update CRM_LISTA_ZASOBOW set \\`DESC\\`=\''.$SERVER_ADDRESS.'\' where \\`DESC\\`=\'biuro.biall-net.pl\' and \\`TYPE\\`=\'SERWER\' and ID=1 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //poprawa danych z referencyjnej bazy BIALL-NET
  $cmd[]['rsh']=' echo " update CRM_LISTA_ZASOBOW set \\`DESC\\`=\''.$REMOTE_FOLDER_ROOT.'\' where \\`DESC\\`=\'SES_USERS2\' and \\`TYPE\\`=\'BAZA_DANYCH\' and ID=2 " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //poprawa danych z referencyjnej bazy BIALL-NET
+ $cmd[]['rsh']=' echo " insert ignore into CRM_LISTA_ZASOBOW (ID, \\`DESC\\`, \\`TYPE\\`) VALUES(2, \'BAZA_DANYCH\', \'BAZA_DANYCH\') " |mysql -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; // create Zasob ID=2 if missing
 
 
 
@@ -1638,6 +1640,7 @@ port=\"3306\"
 user=\"root\"
 pass=\"'.$ADMIN_USERNAME_PASSWD.'\"
 database=\"'.$REMOTE_FOLDER_ROOT.'\"
+zasob_id=\"2\"
 
 " > /Library/Server/Web/Data/Sites/Default/SE/config/.cnf--zasob_2-'.$SERVER_ADDRESS.'.ini.php
 ';
@@ -2042,15 +2045,14 @@ function INSTALL_SES_PROCESY_A() {
 			exec($cmd,$out,$exit);
 			DEBUG_S(-3,'Usuwam stare pliki git ',$cmd,__FILE__,__FUNCTION__,__LINE__);
 
-
-
-
-			{ //@2015-01-27 zrobienie gita z repozytorium
-
+			{// @2016-04-06 fetch source from git and make VERSION file
 
 			$cmd='cd '.$installer_dir_tar.' &&   git clone ssh://git@biuro.biall-net.pl:2222/plabudda/se.git '.$h->ID.'.'.$REMOTE_FOLDER_ROOT.'.git' ;
 			exec($cmd,$out,$exit);
 			DEBUG_S(-3,'Klonowanie aktualnego GIT ',array($cmd,$out,$exit),__FILE__,__FUNCTION__,__LINE__);
+			$cmd = "cd {$installer_dir_tar}/{$h->ID}.{$REMOTE_FOLDER_ROOT}.git/ && echo `git show-ref --head|head -1|head -c 8` > SE/VERSION";
+			exec($cmd,$out,$exit);
+			DEBUG_S(-3,'Klonowanie aktualnego GIT - create VERSION file ',array($cmd,$out,$exit),__FILE__,__FUNCTION__,__LINE__);
 
 			}
 			/*