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/common/configure_fresh_system b/common/configure_fresh_system index 8fec1245..91a862df 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -109,12 +109,13 @@ else ./install.py --clang-completer fi -# 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/bunsen/configure_fresh_system b/debian/configure_fresh_system similarity index 97% rename from bunsen/configure_fresh_system rename to debian/configure_fresh_system index c4e9bc8d..60820f23 100755 --- a/bunsen/configure_fresh_system +++ b/debian/configure_fresh_system @@ -14,7 +14,7 @@ done set -e eval $install_packages -if [[ -z $DONT_START_TOR ]]; then +if [[ -z $NO_SYSTEMCTL ]]; then sudo systemctl enable tor sudo systemctl start tor fi diff --git a/bunsen/test_insider b/debian/test_insider similarity index 77% rename from bunsen/test_insider rename to debian/test_insider index d1612fb6..e1bee875 100755 --- a/bunsen/test_insider +++ b/debian/test_insider @@ -4,7 +4,7 @@ set -e export DEBIAN_FRONTEND=noninteractive export DONT_CHANGE_SHELL=true -export DONT_START_TOR=true +export NO_SYSTEMCTL=true echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries @@ -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/configure_fresh_system b/fedora/configure_fresh_system index a379a25e..7ae12880 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,19 +4,30 @@ set -e #software and shell sudo dnf -y upgrade --best --allowerasing -sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop +sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk git xz util-linux-user powertop dnf-automatic kdiff3 FEDORA_VERSION=`rpm -E %fedora` sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs kicad retext sudo dnf -y groupinstall "C Development Tools and Libraries" -if [[ -z $DONT_START_TOR ]]; then +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +sudo cp -v /etc/dnf/automatic.conf /etc/dnf/automatic.conf.bak +sudo cp -v $DIR/etc/dnf/automatic.conf /etc/dnf/automatic.conf +set +e +sudo diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf +set -e + +if [[ -z $NO_SYSTEMCTL ]]; then + sudo systemctl enable dnf-automatic.timer + sudo systemctl start dnf-automatic.timer + sudo systemctl list-timers "*dnf-*" + 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 diff --git a/fedora/etc/dnf/automatic.conf b/fedora/etc/dnf/automatic.conf new file mode 100644 index 00000000..d5bed173 --- /dev/null +++ b/fedora/etc/dnf/automatic.conf @@ -0,0 +1,46 @@ +[commands] +# What kind of upgrade to perform: +# default = all available upgrades +# security = only the security upgrades +upgrade_type = security +random_sleep = 300 + +# Whether updates should be downloaded when they are available. +download_updates = yes + +# Whether updates should be applied when they are available. +# Note that if this is set to no, downloaded packages will be left in the +# cache regardless of the keepcache setting. +apply_updates = yes + + +[emitters] +# Name to use for this system in messages that are emitted. Default is the +# hostname. +# system_name = my-host + +# How to send messages. Valid options are stdio, email and motd. If +# emit_via includes stdio, messages will be sent to stdout; this is useful +# to have cron send the messages. If emit_via includes email, this +# program will send email itself according to the configured options. +# If emit_via includes motd, /etc/motd file will have the messages. +# Default is email,stdio. +emit_via = stdio,email + + +[email] +# The address to send email messages from. +email_from = root + +# List of addresses to send messages to. +email_to = admin@cyplo.net + +# Name of the host to connect to to send email messages. +email_host = localhost + + +[base] +# This section overrides dnf.conf + +# Use this to filter DNF core messages +debuglevel = 1 diff --git a/fedora/test_insider b/fedora/test_insider index 496329b8..e31efca7 100755 --- a/fedora/test_insider +++ b/fedora/test_insider @@ -3,7 +3,7 @@ set -e export DONT_CHANGE_SHELL=true -export DONT_START_TOR=true +export NO_SYSTEMCTL=true dnf -y install sudo 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..10466feb 100755 --- a/test +++ b/test @@ -5,5 +5,25 @@ if [[ -z $DETECTED_OS ]]; then exit 1 fi -./$DETECTED_OS/test_outsider +if [[ $DETECTED_OS =~ .*:.* ]]; then + 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 +fi + +INSIDER_ROOT_DIR=/root/temp/dotfiles/ +CURRENT_DIR=`pwd` + +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/configure_fresh_system b/ubuntu/configure_fresh_system index 06a7e31a..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 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 vim" +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 @@ -15,7 +15,7 @@ done set -e eval $install_packages -if [[ -z $DONT_START_TOR ]]; then +if [[ -z $NO_SYSTEMCTL ]]; then sudo systemctl enable tor sudo systemctl start tor fi diff --git a/ubuntu/test_insider b/ubuntu/test_insider index 55aa9929..1234fce0 100755 --- a/ubuntu/test_insider +++ b/ubuntu/test_insider @@ -4,7 +4,7 @@ set -e export DEBIAN_FRONTEND=noninteractive export DONT_CHANGE_SHELL=true -export DONT_START_TOR=true +export NO_SYSTEMCTL=true echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries diff --git a/ubuntu/test_outsider b/ubuntu/test_outsider deleted file mode 100755 index 8bce97bf..00000000 --- a/ubuntu/test_outsider +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -docker run -v `pwd`:/root/temp/dotfiles/ ubuntu:xenial /root/temp/dotfiles/ubuntu/test_insider diff --git a/ubuntu/trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system new file mode 100755 index 00000000..dd337830 --- /dev/null +++ b/ubuntu/trusty/configure_fresh_system @@ -0,0 +1,26 @@ +#!/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/../../" +export NO_GO=true +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 +