From 4b4e54c319adfb23bc70224856354809dbfe5dc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= <cyplo@cyplo.net>
Date: Tue, 5 Jul 2016 15:32:12 +0200
Subject: [PATCH 1/7] go with trusty as a basis for ubuntu builds

---
 ubuntu/configure_fresh_system | 2 +-
 ubuntu/test_outsider          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system
index 713b12bc..8039ff40 100755
--- a/ubuntu/configure_fresh_system
+++ b/ubuntu/configure_fresh_system
@@ -5,7 +5,7 @@ set -v
 
 sudo apt-get update
 sudo apt-get -y upgrade
-install_packages="sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs thunderbird thunderbird-enigmail thunderbird-ublock-origin gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted solaar glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext kdiff3 gnupg2 realpath apt-file"
+install_packages="sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs thunderbird thunderbird-enigmail gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext kdiff3 gnupg2 realpath apt-file"
 
 set +e
 for i in `seq 1 3`; do
diff --git a/ubuntu/test_outsider b/ubuntu/test_outsider
index 8bce97bf..20ce97f6 100755
--- a/ubuntu/test_outsider
+++ b/ubuntu/test_outsider
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker run -v `pwd`:/root/temp/dotfiles/ ubuntu:xenial /root/temp/dotfiles/ubuntu/test_insider
+docker run -v `pwd`:/root/temp/dotfiles/ ubuntu:trusty /root/temp/dotfiles/ubuntu/test_insider

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 2/7] 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

From cd79e35fd2218548e19f383722308a6b8be7ec29 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:54:01 +0200
Subject: [PATCH 3/7] allow overrides for specific system version

---
 test                                 | 11 ++++++++---
 ubuntu:trusty/configure_fresh_system | 25 +++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 3 deletions(-)
 create mode 100755 ubuntu:trusty/configure_fresh_system

diff --git a/test b/test
index a1ffffb6..3ca2a066 100755
--- a/test
+++ b/test
@@ -5,8 +5,6 @@ if [[ -z $DETECTED_OS ]]; then
     exit 1
 fi
 
-DIR=$DETECTED_OS
-
 if [[ $DETECTED_OS =~ .*:.* ]]; then
    DIR=`echo $DETECTED_OS | cut -d':' -f1` 
 else
@@ -14,5 +12,12 @@ else
     exit 1
 fi
 
-docker run -v `pwd`:/root/temp/dotfiles/ $DETECTED_OS /root/temp/dotfiles/$DIR/test_insider
+INSIDER_ROOT_DIR=/root/temp/dotfiles/
+CURRENT_DIR=`pwd`
+
+if [[ -d "$CURRENT_DIR/$DETECTED_OS" ]]; then
+    DIR=$DETECTED_OS
+fi
+
+docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DETECTED_OS $INSIDER_ROOT_DIR/$DIR/test_insider
 
diff --git a/ubuntu:trusty/configure_fresh_system b/ubuntu:trusty/configure_fresh_system
new file mode 100755
index 00000000..4941514f
--- /dev/null
+++ b/ubuntu:trusty/configure_fresh_system
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -e
+set -v
+
+sudo apt-get update
+sudo apt-get -y upgrade
+install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag terminator thunderbird thunderbird-enigmail tmux tor torsocks vim whois zsh"
+
+set +e
+for i in `seq 1 3`; do
+        eval $install_packages
+done
+
+set -e
+eval $install_packages
+
+if [[ -z $NO_SYSTEMCTL ]]; then
+	sudo systemctl enable tor
+	sudo systemctl start tor
+fi
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+DIR="$DIR/../"
+DIR="$DIR" $DIR/common/configure_fresh_system

From 4a0c34996940d4e12cf7c72fb9b6b8831191e1fb 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:55:10 +0200
Subject: [PATCH 4/7] do not install fileaptitude on ubuntu

---
 ubuntu/configure_fresh_system | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system
index 01b80361..39f64cdd 100755
--- a/ubuntu/configure_fresh_system
+++ b/ubuntu/configure_fresh_system
@@ -5,7 +5,7 @@ set -v
 
 sudo apt-get update
 sudo apt-get -y upgrade
-install_packages="sudo apt-get -y --fix-missing install apt-file apt-fileaptitude aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag solaar terminator thunderbird thunderbird-enigmail thunderbird-ublock-origin tmux tor torsocks vim whois zsh"
+install_packages="sudo apt-get -y --fix-missing install apt-file aptitude aria2 atop cmake curl dkms freecad gajim git glances gnupg2 golang gparted gsmartcontrol gtk-redshift intltool kdiff3 keepass2 libatk1.0-dev libbonoboui2-dev libcairo2-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libncurses5-dev libx11-dev libxpm-dev libxt-dev linux-kernel-headers lm-sensors meld mercurial nodejs npm pv python-dev python-pip python3-pip realpath redshift retext ruby-dev silversearcher-ag solaar terminator thunderbird thunderbird-enigmail thunderbird-ublock-origin tmux tor torsocks vim whois zsh"
 
 set +e
 for i in `seq 1 3`; do

From 8a80ad038a89673b96ed1363f6f5f2a8f4c073a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= <cyplo@cyplo.net>
Date: Thu, 4 Aug 2016 16:08:47 +0200
Subject: [PATCH 5/7] make git checkout possible on windows as well, eliminate
 special characters from filenames

---
 test                                                 | 12 +++++++++---
 .../trusty}/configure_fresh_system                   |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)
 rename {ubuntu:trusty => ubuntu/trusty}/configure_fresh_system (98%)

diff --git a/test b/test
index 3ca2a066..10466feb 100755
--- a/test
+++ b/test
@@ -6,7 +6,8 @@ if [[ -z $DETECTED_OS ]]; then
 fi
 
 if [[ $DETECTED_OS =~ .*:.* ]]; then
-   DIR=`echo $DETECTED_OS | cut -d':' -f1` 
+   SYSTEM_NAME=`echo $DETECTED_OS | cut -d':' -f1` 
+   SYSTEM_VERSION=`echo $DETECTED_OS | cut -d':' -f2` 
 else
     echo "please set DETECTED_OS to system:version"
     exit 1
@@ -15,8 +16,13 @@ fi
 INSIDER_ROOT_DIR=/root/temp/dotfiles/
 CURRENT_DIR=`pwd`
 
-if [[ -d "$CURRENT_DIR/$DETECTED_OS" ]]; then
-    DIR=$DETECTED_OS
+SYSTEM_DIR="$SYSTEM_NAME/"
+SYSTEM_VERSION_DIR="$SYSTEM_NAME/$SYSTEM_VERSION/"
+
+if [[ -d "$CURRENT_DIR/$SYSTEM_VERSION_DIR" ]]; then
+    DIR=$SYSTEM_VERSION_DIR
+else
+    DIR=$SYSTEM_DIR
 fi
 
 docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DETECTED_OS $INSIDER_ROOT_DIR/$DIR/test_insider
diff --git a/ubuntu:trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system
similarity index 98%
rename from ubuntu:trusty/configure_fresh_system
rename to ubuntu/trusty/configure_fresh_system
index 4941514f..60841244 100755
--- a/ubuntu:trusty/configure_fresh_system
+++ b/ubuntu/trusty/configure_fresh_system
@@ -21,5 +21,5 @@ if [[ -z $NO_SYSTEMCTL ]]; then
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DIR="$DIR/../"
+DIR="$DIR/../../"
 DIR="$DIR" $DIR/common/configure_fresh_system

From cb9825f2603714942a08b0d0941375f6ecf4435b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= <cyplo@cyplo.net>
Date: Thu, 4 Aug 2016 16:08:47 +0200
Subject: [PATCH 6/7] separate script for ubuntu trusty

---
 test                                          | 12 +++++++++---
 .../trusty}/configure_fresh_system            |  2 +-
 ubuntu/trusty/test_insider                    | 19 +++++++++++++++++++
 3 files changed, 29 insertions(+), 4 deletions(-)
 rename {ubuntu:trusty => ubuntu/trusty}/configure_fresh_system (98%)
 create mode 100755 ubuntu/trusty/test_insider

diff --git a/test b/test
index 3ca2a066..10466feb 100755
--- a/test
+++ b/test
@@ -6,7 +6,8 @@ if [[ -z $DETECTED_OS ]]; then
 fi
 
 if [[ $DETECTED_OS =~ .*:.* ]]; then
-   DIR=`echo $DETECTED_OS | cut -d':' -f1` 
+   SYSTEM_NAME=`echo $DETECTED_OS | cut -d':' -f1` 
+   SYSTEM_VERSION=`echo $DETECTED_OS | cut -d':' -f2` 
 else
     echo "please set DETECTED_OS to system:version"
     exit 1
@@ -15,8 +16,13 @@ fi
 INSIDER_ROOT_DIR=/root/temp/dotfiles/
 CURRENT_DIR=`pwd`
 
-if [[ -d "$CURRENT_DIR/$DETECTED_OS" ]]; then
-    DIR=$DETECTED_OS
+SYSTEM_DIR="$SYSTEM_NAME/"
+SYSTEM_VERSION_DIR="$SYSTEM_NAME/$SYSTEM_VERSION/"
+
+if [[ -d "$CURRENT_DIR/$SYSTEM_VERSION_DIR" ]]; then
+    DIR=$SYSTEM_VERSION_DIR
+else
+    DIR=$SYSTEM_DIR
 fi
 
 docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DETECTED_OS $INSIDER_ROOT_DIR/$DIR/test_insider
diff --git a/ubuntu:trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system
similarity index 98%
rename from ubuntu:trusty/configure_fresh_system
rename to ubuntu/trusty/configure_fresh_system
index 4941514f..60841244 100755
--- a/ubuntu:trusty/configure_fresh_system
+++ b/ubuntu/trusty/configure_fresh_system
@@ -21,5 +21,5 @@ if [[ -z $NO_SYSTEMCTL ]]; then
 fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DIR="$DIR/../"
+DIR="$DIR/../../"
 DIR="$DIR" $DIR/common/configure_fresh_system
diff --git a/ubuntu/trusty/test_insider b/ubuntu/trusty/test_insider
new file mode 100755
index 00000000..acfe5d01
--- /dev/null
+++ b/ubuntu/trusty/test_insider
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+export DEBIAN_FRONTEND=noninteractive
+export DONT_CHANGE_SHELL=true
+export NO_SYSTEMCTL=true
+
+echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries
+
+apt-get update
+apt-get install sudo
+cd $HOME
+
+mkdir -p dev/
+cp -rv temp/dotfiles dev/
+
+./dev/dotfiles/ubuntu/trusty/configure_fresh_system
+

From aa43c35e4fea9be64ba52618cd0ec23f18fdd8f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= <cyplo@cyplo.net>
Date: Thu, 4 Aug 2016 17:59:32 +0200
Subject: [PATCH 7/7] do not use Go on ubuntu trusty

---
 common/configure_fresh_system        | 11 ++++++-----
 ubuntu/trusty/configure_fresh_system |  1 +
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/common/configure_fresh_system b/common/configure_fresh_system
index 4fc49505..39fd4f8d 100755
--- a/common/configure_fresh_system
+++ b/common/configure_fresh_system
@@ -93,12 +93,13 @@ cd "$DIR/.vim/bundle/YouCompleteMe/"
 git submodule update --init --recursive
 ./install.py --racer-completer --clang-completer
 
-# go
-export GOPATH="$HOME/go"
-mkdir -p "$GOPATH"
+if [[ -z $NO_GO ]]; then
+    export GOPATH="$HOME/go"
+    mkdir -p "$GOPATH"
 
-# excercism
-go get -u github.com/exercism/cli/exercism
+    # excercism
+    go get -u github.com/exercism/cli/exercism
+fi
 
 # talks: reveal-md
 sudo npm install -g reveal-md
diff --git a/ubuntu/trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system
index 60841244..dd337830 100755
--- a/ubuntu/trusty/configure_fresh_system
+++ b/ubuntu/trusty/configure_fresh_system
@@ -22,4 +22,5 @@ fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../../"
+export NO_GO=true
 DIR="$DIR" $DIR/common/configure_fresh_system