فهرست منبع

Poprawki do instalatora

Mariusz Muszyński 8 سال پیش
والد
کامیت
e2963b84b6

+ 3 - 2
SE/schema/ant-object/default_db.BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA/BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA.xsd

@@ -49,8 +49,9 @@
    </xs:simpleType>
    <xs:simpleType name="BI_analiza_reloadCache_Type">
       <xs:restriction base="xs:string">
-         <xs:enumeration value="Y"/>
-         <xs:enumeration value="N"/>
+         <xs:enumeration value="Full"/>
+         <xs:enumeration value="Part"/>
+         <xs:enumeration value="No"/>
       </xs:restriction>
    </xs:simpleType>
    <xs:complexType name="BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA">

+ 17 - 17
SE/superedit-INSTALL_SES_PROCESY_A.php

@@ -572,7 +572,7 @@ function INSTALL_GETCOMMANDS_XSL_ENGINES($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADM
  $cmd[]['rsh']='installer -package /Volumes/jdk-8u121-macosx-x64.dmg/JDK\ 8\ Update\ 121.pkg -target "/" -verbose';
 
 
- $cmd[]['rsh']='port install saxon';
+ $cmd[]['rsh']='port -N install saxon';
  //todo repo-13 do stuff
  $cmd[]['scp_root']=array($INSTALL_ROOT.'/stuff/expath-repo-0.13.1.zip','/tmp/expath-repo-0.13.1.zip');
  $cmd[]['rsh']='unzip /tmp/expath-repo-0.13.1.zip';
@@ -696,9 +696,9 @@ if($SERVER_VERSION=='10.11-ElCapitan') {
 }
 
 if($SERVER_VERSION=='10.12-Sierra') {
-	$cmd[]['rsh']='port install ImageMagick';
-	$cmd[]['rsh']='port install php56-imagick';
-	$cmd[]['rsh']='port install php56-imagick';
+	$cmd[]['rsh']='port -N install ImageMagick';
+	$cmd[]['rsh']='port -N install php56-imagick';
+	$cmd[]['rsh']='port -N install php56-imagick';
 	$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';
 }
 
@@ -733,16 +733,16 @@ $cmd[]['rsh']='serveradmin stop web && serveradmin start web';
  $cmd[]['rsh']='cat /etc/paths |grep "/opt/local/bin" || echo "/opt/local/bin" >>/etc/paths';
  $cmd[]['rsh']=' grep "/opt/local/bin" /etc/paths || echo "/opt/local/bin" >>/etc/paths'; //dodanie do sciezek
  $cmd[]['rsh']=" sed  -i.bak  \"s/PS1='\\\\\h:/PS1='\\\\\H:/g\" /etc/bashrc"; //zmiana wyswietlania kurosra hosta
- $cmd[]['rsh']='which wget || port install wget';
- $cmd[]['rsh']='which joe || port install joe';
- $cmd[]['rsh']='which gnutar || port install gnutar';
- $cmd[]['rsh']='which gsed || port install gsed';
- $cmd[]['rsh']='which csv2xml || port install csv2xml';
- $cmd[]['rsh']='which xlsx2csv || port install xlsx2csv';
+ $cmd[]['rsh']='which wget || port -N install wget';
+ $cmd[]['rsh']='which joe || port -N install joe';
+ $cmd[]['rsh']='which gnutar || port -N install gnutar';
+ $cmd[]['rsh']='which gsed || port -N install gsed';
+ $cmd[]['rsh']='which csv2xml || port -N install csv2xml';
+ $cmd[]['rsh']='which xlsx2csv || port -N install xlsx2csv';
  $cmd[]['rsh']='ln -s /opt/local/bin/gnutar /usr/sbin/gnutar || echo PASSED';
- $cmd[]['rsh']='which apache-ant || port install apache-ant';
-  $cmd[]['rsh']='which md5sum || port install md5sha1sum';
-  $cmd[]['rsh']='which makepasswd || port install makepasswd';
+ $cmd[]['rsh']='which apache-ant || port -N install apache-ant';
+  $cmd[]['rsh']='which md5sum || port -N install md5sha1sum';
+  $cmd[]['rsh']='which makepasswd || port -N install makepasswd';
 
 
 
@@ -890,7 +890,7 @@ function INSTALL_GETCOMMANDS_DITA($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USER
 	$cmd[]['rsh']="cd /Library/Server/Web/Data/Sites/Default/SE/stuff && unzip dita-ot-2.3.3.zip || echo PASSED";
 	$cmd[]['rsh']="cd /Library/Server/Web/Data/Sites/Default/SE/stuff/dita-ot-2.3.3 && ./startcmd.sh || echo PASSED";
 	//do grafow z obrazkow - do dity
-	$cmd[]['rsh']='port install gnuplot';
+	$cmd[]['rsh']='port -N install gnuplot';
 
 
 
@@ -1127,7 +1127,7 @@ return $cmd;
 function INSTALL_GETCOMMANDS_MYSQL55($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) {
 
 //! MYSQL SERVER INSTALACJA
- $cmd[]['rsh']='port install mysql55-server';
+ $cmd[]['rsh']='port -N install mysql55-server';
  $cmd[]['rsh']='sudo -u _mysql /opt/local/lib/mysql55/bin/mysql_install_db';
  $cmd[]['rsh']='sed -i.bak "s/<key>Disabled<\/key>/<key>Enabled<\/key>/"  /Library/LaunchDaemons/org.macports.mysql55-server.plist'; //zmieniam inita do launchctl aby sam z siebie sie odpalal
  $cmd[]['rsh']='echo "[client]
@@ -1172,8 +1172,8 @@ function INSTALL_GETCOMMANDS_WMS($ADMIN_USERNAME,$SERVER_ADDRESS_IP,$ADMIN_USERN
 //! pakiet: INSTALL_GETCOMMANDS_WMS @2016-07 maintain bzyk
 
 // 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 ';
+ $cmd[]['rsh']='port -N 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 -N install mapserver ';
 // qgis
  $cmd[]['scp']=array($INSTALL_ROOT.'/stuff/qgis__kyngchaos.com/QGIS-2.18.0-1.dmg','/tmp/QGIS-2.18.0-1.dmg');
  $cmd[]['rsh']='hdiutil mount /tmp/QGIS-2.18.0-1.dmg -mountpoint /Volumes/QGIS-2.18.0-1';

+ 1 - 1
SE/superedit-SQIX_STRUCTURE_DB_SYNC.php

@@ -297,7 +297,7 @@ $TABLES_STRUCTURE_arr['MAIN'] = array('QUALITY_NOTICES','QUALITY_NOTICES_HIST','
 $TABLES_STRUCTURE_DATA_arr['MAIN'] = array('CRM_PRZYPADEK','CRM_REF_CONFIG');
 
  
-$TABLES_STRUCTURE_arr['BiAudit'] = array('BI_audit_ALL','BI_audit_ALL_ref','BI_audit_ALL_ref_RELATIONS','BI_audit_CEIDG','BI_audit_CEIDG_pelnomocnicy','BI_audit_CEIDG_powiazania','BI_audit_ENERGA_PRACOWNICY','BI_audit_ENERGA_PRACOWNICY_adresy','BI_audit_ENERGA_PRACOWNICY_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI','BI_audit_ENERGA_RUM_KONTRAHENCI_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object','BI_audit_ENERGA_RUM_UMOWY','BI_audit_ENERGA_RUM_UMOWY_HIST','BI_audit_KRS','BI_audit_KRS_company','BI_audit_KRS_person','BI_audit_KW_requested','BI_audit_KW_requested_HIST','BI_audit_KW_requested_person','CRM__#REF_TABLE__11','CRM__#REF_TABLE__12','CRM__#REF_TABLE__18','CRM__#REF_TABLE__19','CRM__#REF_TABLE__23','CRM__#REF_TABLE__24','CRM__#REF_TABLE__25');
+$TABLES_STRUCTURE_arr['BiAudit'] = array('BI_audit_ALL','BI_audit_ALL_ref','BI_audit_ALL_ref_RELATIONS','BI_audit_CEIDG','BI_audit_CEIDG_pelnomocnicy','BI_audit_CEIDG_powiazania','BI_audit_ENERGA_PRACOWNICY','BI_audit_ENERGA_PRACOWNICY_adresy','BI_audit_ENERGA_PRACOWNICY_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI','BI_audit_ENERGA_RUM_KONTRAHENCI_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_HIST','BI_audit_ENERGA_RUM_KONTRAHENCI_POWIAZANIA_row_object','BI_audit_ENERGA_RUM_UMOWY','BI_audit_ENERGA_RUM_UMOWY_HIST','BI_audit_KRS','BI_audit_KRS_company','BI_audit_KRS_person','BI_audit_KW_requested','BI_audit_KW_requested_HIST','BI_audit_KW_requested_person');
 
 //$TABLES_STRUCTURE_DATA_arr['BiAudit'] = array('BI_audit_ALL','BI_audit_ALL_ref','BI_audit_ALL_ref_RELATIONS','BI_audit_CEIDG','BI_audit_CEIDG_pelnomocnicy','BI_audit_CEIDG_powiazania','BI_audit_KRS','BI_audit_KRS_company','BI_audit_KRS_person','CRM__#REF_TABLE__11','CRM__#REF_TABLE__12','CRM__#REF_TABLE__18','CRM__#REF_TABLE__19');