From 48489827cb90fb7599eda994d8624336065c080a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 5 Jun 2016 15:10:28 +0200 Subject: [PATCH 01/25] use bold font in terminator --- .config/terminator/config | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/.config/terminator/config b/.config/terminator/config index 45eb680c..64154576 100644 --- a/.config/terminator/config +++ b/.config/terminator/config @@ -1,25 +1,9 @@ [global_config] - window_state = maximise borderless = True focus = system title_transmit_bg_color = "#d30102" + window_state = maximise [keybindings] -[profiles] - [[default]] - palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3" - login_shell = True - background_image = None - background_darkness = 0.93 - scrollback_lines = 8192 - background_type = transparent - use_system_font = False - cursor_color = "#eee8d5" - foreground_color = "#eee8d5" - icon_bell = False - show_titlebar = False - font = DejaVu Sans Mono for Powerline 12 - background_color = "#002b36" - scrollback_infinite = True [layouts] [[default]] [[[child1]]] @@ -30,3 +14,19 @@ parent = "" type = Window [plugins] +[profiles] + [[default]] + background_color = "#002b36" + background_darkness = 0.93 + background_image = None + background_type = transparent + cursor_color = "#eee8d5" + font = DejaVu Sans Mono for Powerline Bold 12 + foreground_color = "#eee8d5" + icon_bell = False + login_shell = True + palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3" + scrollback_infinite = True + scrollback_lines = 8192 + show_titlebar = False + use_system_font = False From 4dde20eafa8152fad0fd38cd38d814298bdc2a8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 18 Jun 2016 19:45:40 +0200 Subject: [PATCH 02/25] install gimp and transmission on Fedora by default --- fedora/configure_fresh_system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 7ffd1acc..560059f9 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -2,11 +2,11 @@ #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 npm 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 +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 npm 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 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 install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang +sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang sudo dnf -y groupinstall "C Development Tools and Libraries" sudo systemctl enable tor From 96a40626e7646cc10353a2e50888f35b6e1d7a10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 23 Jun 2016 19:24:20 +0200 Subject: [PATCH 03/25] removed pure debian installation, as supporting only bunsen now --- debian/install_debian.sh | 8 -------- 1 file changed, 8 deletions(-) delete mode 100755 debian/install_debian.sh diff --git a/debian/install_debian.sh b/debian/install_debian.sh deleted file mode 100755 index 1b68b7bc..00000000 --- a/debian/install_debian.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -sudo apt-get update -sudo apt-get dist-upgrade -sudo apt-get install meld whois zsh tmux vim atop aria2 curl pv gajim tor torsocks nodejs - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -$DIR/install_common.sh - From fd4585455934430740bd2c75958af9246a82c30c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 23 Jun 2016 19:24:55 +0200 Subject: [PATCH 04/25] basic test script to use in docker, for bunsen --- bunsen/test | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100755 bunsen/test diff --git a/bunsen/test b/bunsen/test new file mode 100755 index 00000000..5652d765 --- /dev/null +++ b/bunsen/test @@ -0,0 +1,10 @@ +#!/bin/bash + +set -e + +apt-get update +apt-get install sudo +cd $HOME +./dev/dotfiles/bunsen/configure_fresh_system + + From d58d7b47fa176f94dfe34e8b17c8c3c39665e8d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 23 Jun 2016 19:25:59 +0200 Subject: [PATCH 05/25] made travis execute the initial bunsen test as default --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b01ec991..c37f4ac2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: bash -script: ./travis/configure_fresh_system +script: ./bunsen/test git: submodules: false From f9564aa0078f752adb8050869c7f999e6fdcb788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 23 Jun 2016 19:28:52 +0200 Subject: [PATCH 06/25] tell travis to grant us access to docker --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index c37f4ac2..84975271 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,11 @@ language: bash + script: ./bunsen/test + +sudo: required + +services: + - docker git: submodules: false + From ef136e67eee84927af6836ada8e0bfe53c251661 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 23 Jun 2016 19:30:17 +0200 Subject: [PATCH 07/25] actually try running docker instead of the test script --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 84975271..bbd434af 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: bash -script: ./bunsen/test +script: docker run -v `pwd`:/root/dev/dotfiles/ debian:jessie /root/dev/dotfiles/bunsen/test sudo: required From 799033c0698675f76a95ec820ed1427935a2f243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 23 Jun 2016 19:39:03 +0200 Subject: [PATCH 08/25] fail earlier on installing packages for bunsen --- bunsen/configure_fresh_system | 3 +++ bunsen/test | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index bc9cef84..03d4b33e 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/configure_fresh_system @@ -1,4 +1,7 @@ #!/bin/bash + +set -e + sudo apt-get update sudo apt-get -y upgrade sudo apt-get -y install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector 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 wine 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 diff --git a/bunsen/test b/bunsen/test index 5652d765..fba3296a 100755 --- a/bunsen/test +++ b/bunsen/test @@ -2,9 +2,9 @@ set -e +export DEBIAN_FRONTEND=noninteractive apt-get update apt-get install sudo cd $HOME ./dev/dotfiles/bunsen/configure_fresh_system - From fb0256ebf58451644a470dfcb862543b29d59d4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 23 Jun 2016 19:56:13 +0200 Subject: [PATCH 09/25] fix missing packages when installing base list on bunsen --- bunsen/configure_fresh_system | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index 03d4b33e..e9934d4e 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/configure_fresh_system @@ -1,10 +1,11 @@ #!/bin/bash set -e +set -v sudo apt-get update sudo apt-get -y upgrade -sudo apt-get -y install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector 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 wine 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 +sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector 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 wine 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 sudo systemctl enable tor sudo systemctl start tor From da075a057da823bdcf07ee6edc7555840da47653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 23 Jun 2016 20:10:12 +0200 Subject: [PATCH 10/25] do not start tor on CI --- bunsen/configure_fresh_system | 6 ++++-- bunsen/test | 3 +++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index e9934d4e..46feb368 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/configure_fresh_system @@ -7,8 +7,10 @@ sudo apt-get update sudo apt-get -y upgrade sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector 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 wine 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 -sudo systemctl enable tor -sudo systemctl start tor +if [[ -z $DONT_START_TOR]]; then + sudo systemctl enable tor + sudo systemctl start tor +fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../" diff --git a/bunsen/test b/bunsen/test index fba3296a..534b9748 100755 --- a/bunsen/test +++ b/bunsen/test @@ -3,6 +3,9 @@ set -e export DEBIAN_FRONTEND=noninteractive +export DONT_CHANGE_SHELL +export DONT_START_TOR + apt-get update apt-get install sudo cd $HOME From 49faa93fc18b91dec26edbf496aa29c30e6d2e95 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 23 Jun 2016 20:28:05 +0200 Subject: [PATCH 11/25] fixed syntax error in bunsen install script --- bunsen/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index 46feb368..6cb865fe 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/configure_fresh_system @@ -7,7 +7,7 @@ sudo apt-get update sudo apt-get -y upgrade sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector 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 wine 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 -if [[ -z $DONT_START_TOR]]; then +if [[ -z $DONT_START_TOR ]]; then sudo systemctl enable tor sudo systemctl start tor fi From 338b9e700705560c59595264f92887128a407a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 10:53:06 +0200 Subject: [PATCH 12/25] try to tretry failed downloads in apt --- bunsen/test | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bunsen/test b/bunsen/test index 534b9748..de7f7e11 100755 --- a/bunsen/test +++ b/bunsen/test @@ -6,6 +6,9 @@ export DEBIAN_FRONTEND=noninteractive export DONT_CHANGE_SHELL export DONT_START_TOR +echo "APT::Acquire::Retries=16" >> /etc/apt/apt.conf +cat /etc/apt/apt.conf + apt-get update apt-get install sudo cd $HOME From b26b3d8bbf6f51130d1036c6d287cffb831556a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 10:55:49 +0200 Subject: [PATCH 13/25] try to discover travis' apt config --- bunsen/test | 1 + 1 file changed, 1 insertion(+) diff --git a/bunsen/test b/bunsen/test index de7f7e11..d9ee1be2 100755 --- a/bunsen/test +++ b/bunsen/test @@ -6,6 +6,7 @@ export DEBIAN_FRONTEND=noninteractive export DONT_CHANGE_SHELL export DONT_START_TOR +cat /etc/apt/apt.conf echo "APT::Acquire::Retries=16" >> /etc/apt/apt.conf cat /etc/apt/apt.conf From 624c3bc72bfb2edf3c05320234badcf70cb0c39b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 11:00:08 +0200 Subject: [PATCH 14/25] use apt.conf.d for the retries config --- bunsen/test | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bunsen/test b/bunsen/test index d9ee1be2..ed4a34a7 100755 --- a/bunsen/test +++ b/bunsen/test @@ -6,9 +6,7 @@ export DEBIAN_FRONTEND=noninteractive export DONT_CHANGE_SHELL export DONT_START_TOR -cat /etc/apt/apt.conf -echo "APT::Acquire::Retries=16" >> /etc/apt/apt.conf -cat /etc/apt/apt.conf +echo "APT::Acquire::Retries=16" >> /etc/apt/apt.conf.d/99_retries apt-get update apt-get install sudo From 1ce1020dfd06533a45abd2b3a70bf9c2b4a5af84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 11:03:35 +0200 Subject: [PATCH 15/25] added missing semicolon to the apt config --- bunsen/test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bunsen/test b/bunsen/test index ed4a34a7..558ce0d4 100755 --- a/bunsen/test +++ b/bunsen/test @@ -6,7 +6,7 @@ export DEBIAN_FRONTEND=noninteractive export DONT_CHANGE_SHELL export DONT_START_TOR -echo "APT::Acquire::Retries=16" >> /etc/apt/apt.conf.d/99_retries +echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries apt-get update apt-get install sudo From 66c479c1a0ebd3705e9e1b31ac3da15a7902b708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 11:15:58 +0200 Subject: [PATCH 16/25] fix settign the build variables --- bunsen/test | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bunsen/test b/bunsen/test index 558ce0d4..81d3b99d 100755 --- a/bunsen/test +++ b/bunsen/test @@ -3,8 +3,8 @@ set -e export DEBIAN_FRONTEND=noninteractive -export DONT_CHANGE_SHELL -export DONT_START_TOR +export DONT_CHANGE_SHELL=true +export DONT_START_TOR=true echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries From 7d5db6c9e297aeae03cbfcd421695fc166d1825b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 14:46:12 +0200 Subject: [PATCH 17/25] do not use mounted directory direclty in docker --- .travis.yml | 2 +- bunsen/{test => test_insider} | 4 ++++ bunsen/test_outsider | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) rename bunsen/{test => test_insider} (82%) create mode 100644 bunsen/test_outsider diff --git a/.travis.yml b/.travis.yml index bbd434af..5dc1e9ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: bash -script: docker run -v `pwd`:/root/dev/dotfiles/ debian:jessie /root/dev/dotfiles/bunsen/test +script: ./bunsen/test_outsider sudo: required diff --git a/bunsen/test b/bunsen/test_insider similarity index 82% rename from bunsen/test rename to bunsen/test_insider index 81d3b99d..17cf60fb 100755 --- a/bunsen/test +++ b/bunsen/test_insider @@ -11,5 +11,9 @@ echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries apt-get update apt-get install sudo cd $HOME + +mkdir -p dev/dotfiles/ +cp -rv temp/dotfiles dev/dotfiles + ./dev/dotfiles/bunsen/configure_fresh_system diff --git a/bunsen/test_outsider b/bunsen/test_outsider new file mode 100644 index 00000000..8f984aea --- /dev/null +++ b/bunsen/test_outsider @@ -0,0 +1,3 @@ +#!/bin/bash + +docker run -v `pwd`:/root/temp/dotfiles/ debian:jessie /root/temp/dotfiles/bunsen/test From aa96621bcf56aa8545a5834fdfbd8092ca912475 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 14:48:11 +0200 Subject: [PATCH 18/25] added missing execution permissions to the bunsen scripts --- bunsen/test_outsider | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bunsen/test_outsider diff --git a/bunsen/test_outsider b/bunsen/test_outsider old mode 100644 new mode 100755 From 58c5e3f9d8e25d3d6e194eafbda7d0e0cd729e82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 14:49:55 +0200 Subject: [PATCH 19/25] fixed script path for the bunsen test scripts --- bunsen/test_outsider | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bunsen/test_outsider b/bunsen/test_outsider index 8f984aea..d92e862f 100755 --- a/bunsen/test_outsider +++ b/bunsen/test_outsider @@ -1,3 +1,3 @@ #!/bin/bash -docker run -v `pwd`:/root/temp/dotfiles/ debian:jessie /root/temp/dotfiles/bunsen/test +docker run -v `pwd`:/root/temp/dotfiles/ debian:jessie /root/temp/dotfiles/bunsen/test_insider From 70bc0caef9e454264526d7c7fda8eaa5875a417d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 14:51:49 +0200 Subject: [PATCH 20/25] corrected paths to copy the temp files to in bunsen tests --- bunsen/test_insider | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bunsen/test_insider b/bunsen/test_insider index 17cf60fb..d1612fb6 100755 --- a/bunsen/test_insider +++ b/bunsen/test_insider @@ -12,8 +12,8 @@ apt-get update apt-get install sudo cd $HOME -mkdir -p dev/dotfiles/ -cp -rv temp/dotfiles dev/dotfiles +mkdir -p dev/ +cp -rv temp/dotfiles dev/ ./dev/dotfiles/bunsen/configure_fresh_system From 7bba9e1d3f0441337d1756279eff9a943e20ed81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 15:03:55 +0200 Subject: [PATCH 21/25] retry package installation 3 times --- bunsen/configure_fresh_system | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index 6cb865fe..39432a89 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/configure_fresh_system @@ -5,7 +5,10 @@ set -v sudo apt-get update sudo apt-get -y upgrade -sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector 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 wine 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 +for i in `seq 1 3`; + do + sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector 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 wine 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 + done if [[ -z $DONT_START_TOR ]]; then sudo systemctl enable tor From 4f3feb80dd70a9e62097b033dd22f418f0525a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 15:13:45 +0200 Subject: [PATCH 22/25] do not fail the whole installation if one of the package install retries fails --- bunsen/configure_fresh_system | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index 39432a89..68b7bef7 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/configure_fresh_system @@ -5,10 +5,15 @@ set -v sudo apt-get update sudo apt-get -y upgrade -for i in `seq 1 3`; - do - sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector 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 wine 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 - done +install_packages="sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector 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 wine 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" + +set +e +for i in `seq 1 3`; do + eval $install_packages +done + +set -e +eval $install_packages if [[ -z $DONT_START_TOR ]]; then sudo systemctl enable tor From b172bcdce5f3a1ddd449ccff9d8a200a22437722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 15:50:28 +0200 Subject: [PATCH 23/25] try both places where rvm env might reside --- common/configure_fresh_system | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 0d6d4e1d..806deff3 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -98,7 +98,10 @@ cargo install racer # rvm gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 $CURL -L https://get.rvm.io | bash -s stable +set +e +source /etc/profile.d/rvm.sh source $HOME/.rvm/scripts/rvm +set -e rvm install ruby # go From 2c9fe9ee3bd9ce3939392cc912523af3d30490d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 24 Jun 2016 15:55:29 +0200 Subject: [PATCH 24/25] compile vim only after all other configs done --- bunsen/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index 68b7bef7..a792e7cb 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/configure_fresh_system @@ -22,6 +22,7 @@ fi DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../" +DIR="$DIR" $DIR/common/configure_fresh_system # install vim from sources VIM_BUILD_DIR=/tmp @@ -41,4 +42,3 @@ sudo make install cd rm -fvr "$VIM_BUILD_DIR/vim" -DIR="$DIR" $DIR/common/configure_fresh_system From 1de46b96fea2d25017e73b95f459f01975f05372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 13:29:03 +0200 Subject: [PATCH 25/25] guess the user name if not present in cyryl --- common/configure_fresh_system | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 806deff3..9b7f0007 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -1,6 +1,7 @@ #!/bin/bash set -e +set -v echo echo "configuring settings common among OSes" sudo true @@ -119,6 +120,10 @@ sudo npm install -g diff-so-fancy echo "installing vdirsyncer" sudo pip install vdirsyncer +if [[ -z $USER ]]; then + USER=`whoami` +fi + # normalize npm permissions mkdir -p $HOME/.npm sudo chown $USER $HOME/.npm -R