added terminal detection

diff --git a/Diff/Mod/Main.odc b/Diff/Mod/Main.odc
index 2612b8af3858c5291d5c40d3258639da35fa26c5..39d5524c63dd79b3d6c7cb6d9f2ee6cf57063fc8 100644 (file)
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 782b57cec8fe2d6b9c8d11514da3f4851b038021..e25f075acf51a3aebee0b0945f255ae07eb254bd 100644 (file)
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 06fab0be99c73107c700af4cd10f487318020820..db90c5f16aa171a2a4f0cc0a350af24bfd69f2f0 100644 (file)
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 (file)
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 270ca318647f9ab9a0df9b3f915d6ab35a4ff578..6b3cf7504de8429e0e83019df1ffca538570164f 100755 (executable)
--- 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 a7ec05ec822cc20d7fc6edb89766f9029714f1a8..bbee7baaa06e76f9ac553f47241e2d4e1568829f 100644 (file)
--- 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
        }