diff --git a/Dockerfile b/Dockerfile index 7809f46..60a77dc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ FROM debian:jessie MAINTAINER Alexander Turcic "alex@zeitgeist.se" -ENV BCOMPARE_URL http://www.scootersoftware.com/bcompare-4.1.3.20814_amd64.deb +ENV BCOMPARE_URL https://www.scootersoftware.com/bcompare-4.2.4.22795_amd64.deb # Install dependencies. RUN \ diff --git a/README.md b/README.md index 92e1c6b..ea4ca90 100644 --- a/README.md +++ b/README.md @@ -43,3 +43,36 @@ $ docker run --rm \ -v "${HOME}/bcompare":"/home/user" \ zeitgeist/docker-bcompare ``` + +You can create a shell script for comparing directly two files/folder by running 'script f1 f2': + +```bash +#!/bin/sh + +FILES_COMPARE="$@" + +docker run -it --rm \ + -v /tmp/.X11-unix:/tmp/.X11-unix:ro \ + -e DISPLAY=unix$DISPLAY \ + -e FILES="${FILES_COMPARE}" \ + -v $(pwd):"/home/user" \ + zeitgeist/docker-bcompare \ + bash -c 'cd /home/user ; bcompare $FILES' +``` + +## OS X + +For running in OS X, you can create a shell script like this: + +```bash +#!/bin/sh + +ip=$(ifconfig en0 | grep inet | awk '$1=="inet" {print $2}') +xhost + $ip + +docker run -it --rm \ + -e DISPLAY=$ip:0 \ + -v /tmp/.X11-unix:/tmp/.X11-unix \ + -v "${HOME}/bcompare":"/home/user" \ + zeitgeist/docker-bcompare +```