From 52675a2b8cd6c8ee3e55a62e1363bdaa5bd24457 Mon Sep 17 00:00:00 2001
From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Sun, 17 Mar 2019 15:22:33 +0300
Subject: [PATCH] added terminal detection

---
 Diff/Mod/Main.odc          | Bin 13608 -> 13832 bytes
 Diff/Mod/Sys.odc           | Bin 3542 -> 3939 bytes
 Diff/Mod/SysLinux.odc      | Bin 4225 -> 4445 bytes
 Diff/Mod/SysLinuxLibc.odc  | Bin 0 -> 1146 bytes
 Diff/Script/build-linux.sh |   2 +-
 README                     |  15 ++++++++-------
 6 files changed, 9 insertions(+), 8 deletions(-)
 create mode 100644 Diff/Mod/SysLinuxLibc.odc

diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc
index 2612b8af3858c5291d5c40d3258639da35fa26c5..39d5524c63dd79b3d6c7cb6d9f2ee6cf57063fc8 100644
GIT binary patch
delta 362
zcmZ3H)sZuyo~hMzVq+}VWfKMlP6h^s(<T#NxG<HPOx9zx<El4eVBiM|mK#kjV_e2~
zVzMk#DGvh|Py_^Cx-m`u&m^&V8&d=m<Alxptf{;zAxfIo3L%L})(XKTMVWc&8cHdd
z#feEdsS0WNMY)M3B|x#s2L+WTmk23OULX{mQIT1qppl%Pl4_;k=@;Va?i!?N&CBWJ
z>h9^s%gO2KrjVSUlV6lsm8uZp;p(U0l9`qkTv@CaoLb_NnwD6aQ&Ozp>gNK~!U>ad
z1sVx9QInSwD5U`6Tk}qSCsZ}LK)7}DUtvFCMNYV>R<>|6J&Qw9i*hsb5_2>(H+!n9
zF*1fsF3=ETb#wFycHJDVp};n|UN3d>8$HF%cKR2YRXGz=QWP@tQZkbhOEUBG6!O!6
Zyt2$<kZ(&8lZy3=3lftz^BBu80RXd<amN4v

delta 227
zcmeCkS&=oNo@uGc#Ku^z&&CW4oD2*MuZ<_ZaABHiJXw#?j%&Ul0|P%$aJu2-GR9?$
zYLjJ|N_k#^l!3rYH>Sz|nItxEV~Sv6%-GD&n#wzQmyj~2esX?Jeo<ys>g2mZ(UaE-
z=W@7Yrlkc}7VAxx5^05VHqRIF6W%PKp~AR1Lz9CIE<U+HKNZ2bs;_9^?BgHo%F78e
pB{;Rjv81F(qq<f{0VbA`nwD6aQ{oJ=S#$GO{Y%W7-y2IZ0RTOgNyq>I

diff --git a/Diff/Mod/Sys.odc b/Diff/Mod/Sys.odc
index 782b57cec8fe2d6b9c8d11514da3f4851b038021..e25f075acf51a3aebee0b0945f255ae07eb254bd 100644
GIT binary patch
delta 395
zcmca6{a9{7J<|ieiH)&bdVCBFoD2*MYJ3x4xG-Jdovg=bCwz;Wfq@?=cnL^DK<4Ip
z#&wJ;V7?kqh=~Iv?f_zOfmoU#78{7AGTE5f-!=)v2dgdtvDiT}{&2ByxL5^<1vbGL
z!~&aOxOqSGduCCW)U?FXoRVTK9R)wva2*9#-+++F$rITmC$DBVoIIIL+~2b}B(*3v
zGcPemOF=`^O2NtB-^bO_52ijM#MLj@)5*uxnwQhb)!oyNmy<KdH6%31Pr=R6C)kyj
z)78&K0b$7ITkJB-oN#L=pXE@SY{ShV2@`>+4^AzC2~2*%)hCY7kKzcRZX+3loQ5Wb
JZOPolOaM@?TY3Nh

delta 154
zcmaDXcTIXiJyS66#Ku^zg**%loD2*MGkGSyaA9)hnXJcXC+y3`z`zd_bOq87;Jvw?
zaUCNY2Z(1nIgr`k)(gmD0_g;+Wa0*~qJS8}0_kRA2Z>q2SqQO;&3BpKGf)1@uD5wI
QhZOT<ex91m|9MiF0JN1Dwg3PC

diff --git a/Diff/Mod/SysLinux.odc b/Diff/Mod/SysLinux.odc
index 06fab0be99c73107c700af4cd10f487318020820..db90c5f16aa171a2a4f0cc0a350af24bfd69f2f0 100644
GIT binary patch
delta 278
zcmZovysI>!p6Qmr#Ku@I4FLuQP6h@B1%Zh#T$oPrPu63!6TZUBz`zd_JOiX5;QQoy
zMt{bWlg~5yGQONF%jC<w5GcXO29jMhIh)BzNJqgXGc7H+ve+jxue8D^GbwrVTBeum
z94@J8iKRIu#glJv$!X>)X)0)FDHNp^r<N#`q!#67<|XDRXle3ty85{&1gDn3RbOD0
z+&r1fpLz0qR<3Bz;t-fx4NWTrCx3q*S4Tf<UQQ=hcTYcFPR=0LkkBAM3>WBS7AKaJ
fRB9BLq~w>DXeuZx7(i@77&!SdZ_4H{K5ZrdGm%qW

delta 125
zcmcbs)TlV2p6MU|#Ku@IAASY~P6h@B7ygMaT$tYRP1a+y6aK-&zyK6y_yD9K;O*pk
zMt{cblg~5yGS*F&W%6bGGr5$>Y4b^@m+YHmxqX-?-{lLHbN2BMcID*^FUl-Q4Gu0T
Y(lB(2P|#LTiZ;kq(zM=e$gjf$0H(Gh761SM

diff --git a/Diff/Mod/SysLinuxLibc.odc b/Diff/Mod/SysLinuxLibc.odc
new file mode 100644
index 0000000000000000000000000000000000000000..e68ad863da22c69dbd390ec772152e65aaabafd5
GIT binary patch
literal 1146
zcmah}y-OTH6n_^(q9#W~EW~P&fXNk0(pdNb%Iy}xyR6=+g@?ttH-`)BF6_*q*NL_v
zq_j)GN>b%NvJ2_rHn9-Qd-HKS=LPd%c)xiczxQV5?N+@Y1(dTJFAaM~ED_voijLWM
zjE7*khV9if5$z~p8FzOhcC3O4S^M8jk!FlYQOO7@NAeukpD_u~trGRL!(v5c@mp32
zxocT;2|s2>GBJNDSpj^cpFq5-%Fr>l*@;js;xUV^3-iF1KhZ3tsM(*&a4tD?7f50?
zLM$Wg<<B(F4eD38e(62H79rJ>PFoiuiw=5%@!^x0lsN-R1S)X-NdovH)n~Nb*8^{-
z<~v^0?Kb<o7A3utT67RPt@#+0%Tsr8et)@Kp7>DT3>w=GMv$K@n~k9Adpix^X@y}s
zj^8itI}vXS(XTjfx}7Bx>qd!qJG8@W|D!ij)Ge#i(Mx7&9Mh=al~qNipO|jUb{2SK
z1pehRoDY110hrO(MMGdoNp;oenT8}%6{#cbD6F{|pzp{+vv8@{)GQP{P0^3ll*=I*
zIE*!?TqENM_Vi|`q5loRYf4h@j^N!7MKUc)@D)F1av0}XUZz+}9v>hR`0^Hj*2+~2
oUfjZ({d;(L*Hb1*YdV$`dFdA$9GrzqIK7*cYc@E9Z<PyxztxI44FCWD

literal 0
HcmV?d00001

diff --git a/Diff/Script/build-linux.sh b/Diff/Script/build-linux.sh
index 270ca31..6b3cf75 100755
--- a/Diff/Script/build-linux.sh
+++ b/Diff/Script/build-linux.sh
@@ -6,7 +6,7 @@ cd "$DIR/../.."
 
 ./blackbox <<DATA
 
-DevCompiler.CompileThis DiffBase DiffSys DiffSysLinux DiffMain
+DevCompiler.CompileThis DiffBase DiffSys DiffSysLinuxLibc DiffSysLinux DiffMain
 
 Dev2Linker1.LinkElf Linux odctool := Kernel$+ Files HostFiles HostConsole Log Math Strings Dialog Meta Stores Sequencers Models Converters Fonts Ports Services Views Printers Dates Printing Controllers Mechanisms Properties Containers Documents Windows Console StdInterpreter StdDialog StdApi StdCmds StdCFrames Controls HostFonts HostWindows HostDialog TextModels TextRulers TextSetters TextViews TextControllers TextMappers StdStamps StdClocks StdFolds StdETHConv StdLinks HostTextConv StdLog DevCommanders DiffBase DiffSys DiffSysLinux DiffMain
 
diff --git a/README b/README
index a7ec05e..bbee7ba 100644
--- a/README
+++ b/README
@@ -33,7 +33,7 @@ To build it, open DiffMain and execute commanders at the end of document.
 Call `odctool help` to learn how to use it.
 
 
-Integration with Git
+Integration with git
 --------------------
 
 1. Compile odctool.
@@ -47,10 +47,10 @@ Integration with Git
 
 	[merge "odctool"]
 		name = BlackBox Compound Document merge driver
-		driver = /path/to/odctool merge -p %P -o %A %A %O %B
+		driver = odctool merge -p %P -o %A %A %O %B
 	[diff "odctool"]
 		name = BlackBox Compound Document diff driver
-		command = /path/to/odctool-gitdiff
+		command = odctool-gitdiff
 
 4. Add to .git/info/attributes:
 
@@ -63,7 +63,8 @@ Integration with Git
 	*.osf
 	odc[0-9][0-9][0-9][0-9][0-9]
 
-Now you can see diffs using `git diff' and resolve conflicts from BlackBox.
+
+Now you can see diffs using `git diff' and resolve conflicts without converting odc to text.
 
 
 Integration with ranger
@@ -77,9 +78,9 @@ Integration with ranger
 			...
 
 			# BlackBox Compound Document
-		        odc)
-		                odctool -C cat "${FILE_PATH}" && exit 5
-                		exit 1;;
+			odc)
+				odctool -C cat "${FILE_PATH}" && exit 5
+				exit 1;;
 		esac
 	}
 
-- 
2.29.2