From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Sun, 17 Mar 2019 12:22:33 +0000 (+0300)
Subject: added terminal detection
X-Git-Url: http://deadsoftware.ru/gitweb?p=bbdiff.git;a=commitdiff_plain;h=52675a2b8cd6c8ee3e55a62e1363bdaa5bd24457

added terminal detection
---

diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc
index 2612b8a..39d5524 100644
Binary files a/Diff/Mod/Main.odc and b/Diff/Mod/Main.odc differ
diff --git a/Diff/Mod/Sys.odc b/Diff/Mod/Sys.odc
index 782b57c..e25f075 100644
Binary files a/Diff/Mod/Sys.odc and b/Diff/Mod/Sys.odc differ
diff --git a/Diff/Mod/SysLinux.odc b/Diff/Mod/SysLinux.odc
index 06fab0b..db90c5f 100644
Binary files a/Diff/Mod/SysLinux.odc and b/Diff/Mod/SysLinux.odc differ
diff --git a/Diff/Mod/SysLinuxLibc.odc b/Diff/Mod/SysLinuxLibc.odc
new file mode 100644
index 0000000..e68ad86
Binary files /dev/null and b/Diff/Mod/SysLinuxLibc.odc differ
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
 	}