From bb2c8502c550c3cce22da9a2cc3e02423f9a0206 Mon Sep 17 00:00:00 2001 From: "sergey.tolstyh" Date: Tue, 25 Feb 2025 17:44:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B5=D0=B7=D0=B4=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BD=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=B3=D1=80?= =?UTF-8?q?=D0=B0=D0=B4=D0=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 81 +++++++++++++++++++++++++++++++++++++- dependencies.gradle | 3 +- src/dist/bin/sync-full | 9 +---- src/dist/bin/sync-full.bat | 5 +-- 4 files changed, 82 insertions(+), 16 deletions(-) diff --git a/.gitattributes b/.gitattributes index 567d4e9..dffc51b 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,79 @@ -*.bat text eol=crlf -gradlew text eol=lf +# Explicitly declare text=auto files you want to always be normalized and converted +# to native line endings on checkout. +* text=auto +*.txt text +*.log text +*.sql text +*.template text +*.properties text +*.rc text +*.ini text +*.tpl text +*.cfg text +*.bat text +*.cmd text +*.iss text +*.ipr text +*.iml text +*.iws text +*.java text +*.jj text +*.cup text +*.pl text +*.pas text +*.pp text +*.inc text +*.dpk text +*.bpk text +*.dfm text +*.xfm text +*.lfm text +*.dpr text +*.bpr text +*.bpg text +*.lpr text +*.lrs text +*.frc text +*.lpk text +*.lpi text +*.dproj text +*.bdsproj text +*.bdsgroup text +*.groupproj text +*.cbproj text +*.dof text +*.cpp text +*.c text +*.h text +*.awk text +*.sh text eol=lf +*.csv text +*.url text +*.tld text +*.xml text +*.xsl text +*.xsd text +*.jrxml text +*.dtd text +*.js text +*.json text +*.css text +*.jsp text +*.htm text +*.html text +*.rtx text +*.tsv text +*.etx text +*.sgm text +*.sgml text +*.talk text +*.vcf text +makefile text eol=lf +COPYING text +.gitattributes text +.gitignore text +*.gradle text +.*src text +*.stg text +*.g text +*. eol=lf diff --git a/dependencies.gradle b/dependencies.gradle index 8db6fd6..6d15e95 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,8 +1,7 @@ repositories { - mavenCentral() mavenLocal() maven { - url 'https://nexus.red-soft.ru/repository/public' + url 'https://ncore-repo.red-soft.ru/repository/public' if (project.credentials.user != null && project.credentials.password != null) { credentials { username project.credentials.user diff --git a/src/dist/bin/sync-full b/src/dist/bin/sync-full index 9a59b15..033c04e 100644 --- a/src/dist/bin/sync-full +++ b/src/dist/bin/sync-full @@ -1,13 +1,6 @@ #!/bin/bash -$(dirname $0)/starter patch updates - -if [ $? -ne 0 ] ; then - echo Error patch loading - exit 10 -fi - -$(dirname $0)/starter update -fullSync +$(dirname $0)/starter update -fullSync -skipUpdate if [ $? -ne 0 ] ; then echo Error updating database diff --git a/src/dist/bin/sync-full.bat b/src/dist/bin/sync-full.bat index 4fa76e4..f0ff8f9 100644 --- a/src/dist/bin/sync-full.bat +++ b/src/dist/bin/sync-full.bat @@ -1,7 +1,4 @@ @echo off -call "%~dp0\starter.bat" patch updates -if ERRORLEVEL == 1 goto :EOF - -call "%~dp0\starter.bat" update -fullSync +call "%~dp0\starter.bat" update -fullSync -skipUpdate @pause \ No newline at end of file