From 6117364ec838c4f6ba3c62da0c25a87b11d51e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= <cyplo@cyplo.net>
Date: Thu, 4 Aug 2016 15:36:04 +0200
Subject: [PATCH] allow to specify system version in travis builds

---
 .kdiff3rc                                 |  3 ++-
 .travis.yml                               |  7 ++++---
 bunsen/test_outsider                      |  3 ---
 {bunsen => debian}/configure_fresh_system |  0
 {bunsen => debian}/test_insider           |  2 +-
 fedora/test_outsider                      |  3 ---
 test                                      | 11 ++++++++++-
 ubuntu/test_outsider                      |  3 ---
 8 files changed, 17 insertions(+), 15 deletions(-)
 delete mode 100755 bunsen/test_outsider
 rename {bunsen => debian}/configure_fresh_system (100%)
 rename {bunsen => debian}/test_insider (85%)
 delete mode 100755 fedora/test_outsider
 delete mode 100755 ubuntu/test_outsider

diff --git a/.kdiff3rc b/.kdiff3rc
index f16aadf1..534772a0 100644
--- a/.kdiff3rc
+++ b/.kdiff3rc
@@ -95,8 +95,9 @@ WordWrap=false
 [MainWindow]
 Height 768=769
 Height 900=901
+Height 975=976
 Height 985=986
-State=AAAA/wAAAAD9AAAAAAAAB4AAAANGAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
+State=AAAA/wAAAAD9AAAAAAAAB4AAAANTAAAABAAAAAQAAAAIAAAACPwAAAABAAAAAgAAAAEAAAAWAG0AYQBpAG4AVABvAG8AbABCAGEAcgEAAAAA/////wAAAAAAAAAA
 ToolBarsMovable=Disabled
 Width 1366=1367
 Width 1440=1441
diff --git a/.travis.yml b/.travis.yml
index b20207b3..5e665512 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,10 @@ script:
     - ./test 
 
 env:
-    - DETECTED_OS=fedora
-    - DETECTED_OS=bunsen
-    - DETECTED_OS=ubuntu
+    - DETECTED_OS=fedora:24
+    - DETECTED_OS=debian:jessie
+    - DETECTED_OS=ubuntu:trusty
+    - DETECTED_OS=ubuntu:xenial
 
 sudo: required
 
diff --git a/bunsen/test_outsider b/bunsen/test_outsider
deleted file mode 100755
index d92e862f..00000000
--- a/bunsen/test_outsider
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker run -v `pwd`:/root/temp/dotfiles/ debian:jessie /root/temp/dotfiles/bunsen/test_insider
diff --git a/bunsen/configure_fresh_system b/debian/configure_fresh_system
similarity index 100%
rename from bunsen/configure_fresh_system
rename to debian/configure_fresh_system
diff --git a/bunsen/test_insider b/debian/test_insider
similarity index 85%
rename from bunsen/test_insider
rename to debian/test_insider
index 8e653f4d..e1bee875 100755
--- a/bunsen/test_insider
+++ b/debian/test_insider
@@ -15,5 +15,5 @@ cd $HOME
 mkdir -p dev/
 cp -rv temp/dotfiles dev/
 
-./dev/dotfiles/bunsen/configure_fresh_system
+./dev/dotfiles/debian/configure_fresh_system
 
diff --git a/fedora/test_outsider b/fedora/test_outsider
deleted file mode 100755
index 0f43e663..00000000
--- a/fedora/test_outsider
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker run -v `pwd`:/root/temp/dotfiles/ fedora:24 /root/temp/dotfiles/fedora/test_insider
diff --git a/test b/test
index 24ad174e..a1ffffb6 100755
--- a/test
+++ b/test
@@ -5,5 +5,14 @@ if [[ -z $DETECTED_OS ]]; then
     exit 1
 fi
 
-./$DETECTED_OS/test_outsider
+DIR=$DETECTED_OS
+
+if [[ $DETECTED_OS =~ .*:.* ]]; then
+   DIR=`echo $DETECTED_OS | cut -d':' -f1` 
+else
+    echo "please set DETECTED_OS to system:version"
+    exit 1
+fi
+
+docker run -v `pwd`:/root/temp/dotfiles/ $DETECTED_OS /root/temp/dotfiles/$DIR/test_insider
 
diff --git a/ubuntu/test_outsider b/ubuntu/test_outsider
deleted file mode 100755
index 20ce97f6..00000000
--- a/ubuntu/test_outsider
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-docker run -v `pwd`:/root/temp/dotfiles/ ubuntu:trusty /root/temp/dotfiles/ubuntu/test_insider