Prechádzať zdrojové kódy

Dodanie to instalatora git modules

Mariusz Muszyński 8 rokov pred
rodič
commit
6565aa5e2d
1 zmenil súbory, kde vykonal 13 pridanie a 6 odobranie
  1. 13 6
      SE/superedit-INSTALL_SES_PROCESY_A.php

+ 13 - 6
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -1572,8 +1572,8 @@ function INSTALL_GETCOMMANDS_SE($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERNA
   $cmd[]['rsh']='rm /Library/Server/Web/Data/Sites/Default/SE/bash_force_classified_table_by_GroupID.php || echo PASSED';
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/bash_force_classified_table_by_GroupID.php','/Library/Server/Web/Data/Sites/Default/SE/');
   $cmd[]['scp_root']=array($INSTALL_ROOT.'/bash_Route_Users_Task_AddUser.php','/Library/Server/Web/Data/Sites/Default/SE/');
-
-
+  $cmd[]['rsh']='rm -Rf /Library/Server/Web/Data/Sites/Default/SE/projects || echo PASSED';
+  $cmd[]['scp_root']=array($INSTALL_ROOT.'/projects','/Library/Server/Web/Data/Sites/Default/SE/');
 
 
 
@@ -1663,7 +1663,7 @@ $cmd[]['rsh']='php /Library/Server/Web/Data/Sites/Default/SE/bash_install_check.
 //@2016-06 bindera: po aktualizacji sql czesto nie dziala event sheduler np zoompak
 $cmd[]['rsh']=' echo " SET GLOBAL event_scheduler =  \"ON\" " |mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' '; //zalozenie 1 usera TODO synchronizacja z ldap
  $cmd[]['rsh']=' { '.tell_user_gui_error("System zostal zainstalowany - wejdz przegladarka na adres www https://".$SERVER_ADDRESS." (alternatywnie https://".$SERVER_ADDRESS.".procesy5.pl - jezeli domena ".$SERVER_ADDRESS." nie zostala jeszcze skonfigurowana), zaloguj sie na uzytkownika:".$ADMIN_USERNAME." (administrator uzytkownikow) lub ".$ADMIN_USERNAME_DIRECTORY." (administrator domeny LDAP/systemu) . Powinienes teraz zalozyc uzytkownikow systemu i nadac hasla - jezeli jest to pierwsza instalacja ").'; exit 0; } '; //komunikat dla uzytkownika
-
+ if (!empty($OPTIONS->VERSION_GIT)) $cmd[]['rsh']='mysql -h127.0.0.1 -uroot -p\''.$ADMIN_USERNAME_PASSWD.'\' -D'.$REMOTE_FOLDER_ROOT.' -e "REPLACE INTO \\`CRM_CONFIG\\` (\\`CONF_KEY\\`,\\`CONF_VAL\\`) VALUES (\'activeProject\',\''.$OPTIONS->VERSION_GIT.'\')"';
 
 
 	return $cmd;
@@ -2642,6 +2642,7 @@ function MAKE_PKG_COMPONENT($h,$installer_dir_tar,$installer_url,$installer_tmp,
 
 function INSTALL_SES_PROCESY_A() {
   $INSTALL_ROOT='/Library/Server/Web/Data/Sites/SE-production-git/SE'; //glowny katalog ze zrodlem SE
+  $OPTIONS = new stdClass();
   $OPTIONS->SE_config='/Library/Server/Web/Data/Sites/SE-config'; //glowny katalog z konfigami
 //DB::query('update SES_PROCESY5_A set INSTALL_COMPLETE_POINT=0 ');
 //TODO@2013-10-05 - należy dorobić obsługę ADMIN_USERNAME_INITIAL_PASSWD aby jednorazowo się zalogowało i zmieniło na ADMIN_USERNAME_PASSWD (jakis hash) i jego juz potem wszedzie uzywalo - aby klient go nie znal
@@ -2662,7 +2663,7 @@ function INSTALL_SES_PROCESY_A() {
  while($h=DB::fetch($res)) {
    $REMOTE_FOLDER_ROOT=str_replace(array(".","-"),'_',$h->SERVER_ADDRESS); //also database name!
 
-
+	$OPTIONS->VERSION_GIT = $h->VERSION_GIT;
 
 
 
@@ -2809,6 +2810,13 @@ function INSTALL_SES_PROCESY_A() {
 			$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__);
+
+			if ($h->VERSION_GIT) {
+				$cmd = "cd {$installer_dir_tar}/{$h->ID}.{$REMOTE_FOLDER_ROOT}.git/ && git submodule update --init 'SE/projects/{$h->VERSION_GIT}'";
+				exec($cmd,$out,$exit);
+				DEBUG_S(-3,"Klonowanie modułu projektu GIT \"{$h->VERSION_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__);
@@ -3030,9 +3038,8 @@ function INSTALL_SES_PROCESY_A() {
 
 		DEBUG_S(-3,'Dane komponentow instalacji',$packages,__FILE__,__FUNCTION__,__LINE__);
 
-
 		foreach($packages as $pkg_id=>$pkg_info) {
-			$cmd=$pkg_info['CMD_FUNCTION']($h->ADMIN_USERNAME,$h->SERVER_ADDRESS_IP,$h->ADMIN_USERNAME_PASSWD,$h->SERVER_MOUNT_POINT_ROOT,$h->SERVER_ADDRESS,$h->SERVER_ADDRESS_LDAP_DC,$h->SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$h->ADMIN_USERNAME_L1,$h->ADMIN_USERNAME_L1_PASS,$h->ADMIN_USERNAME_DIRECTORY,$h->ADMIN_USERNAME_INITIAL_PASSWD,$h->BACKUP_USB_DEVICE,$h->SERVER_VERSION);
+			$cmd=$pkg_info['CMD_FUNCTION']($h->ADMIN_USERNAME,$h->SERVER_ADDRESS_IP,$h->ADMIN_USERNAME_PASSWD,$h->SERVER_MOUNT_POINT_ROOT,$h->SERVER_ADDRESS,$h->SERVER_ADDRESS_LDAP_DC,$h->SERVER_ADDRESS_SHORT,$INSTALL_ROOT,$REMOTE_FOLDER_ROOT,$h->ADMIN_USERNAME_L1,$h->ADMIN_USERNAME_L1_PASS,$h->ADMIN_USERNAME_DIRECTORY,$h->ADMIN_USERNAME_INITIAL_PASSWD,$h->BACKUP_USB_DEVICE,$h->SERVER_VERSION,$OPTIONS);
 			DEBUG_S(-3,'Robie pkg '.$pkg_info['CMD_FUNCTION'],null,__FILE__,__FUNCTION__,__LINE__);
 			MAKE_PKG_COMPONENT($h,$installer_dir_tar,$installer_url,$pkg_info['installer_tmp'],$cmd,$pkg_info['exit_file'],$pkg_info['installer_dir_name'],$pkg_id,$pkg_info['encrypt']);
 			$package_xml['pkg-ref'].='<pkg-ref id="'.$pkg_id.'"/>';