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 001/144] 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 002/144] 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 003/144] 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 004/144] 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 005/144] 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 006/144] 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 007/144] 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 008/144] 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 009/144] 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 010/144] 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 011/144] 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 012/144] 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 013/144] 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 014/144] 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 015/144] 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 016/144] 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 017/144] 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 018/144] 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 019/144] 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 020/144] 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 021/144] 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 022/144] 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 8c9bdd1f33f3d84159953aa09febc1b754ef39cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 11:59:39 +0200 Subject: [PATCH 023/144] oh-my-zsh upgrade --- .oh-my-zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.oh-my-zsh b/.oh-my-zsh index 83cf8dc1..7fabc8bc 160000 --- a/.oh-my-zsh +++ b/.oh-my-zsh @@ -1 +1 @@ -Subproject commit 83cf8dc16f51babbb0193c5b97e568739c1f40de +Subproject commit 7fabc8bca41d4ff7090325116a85513dac852236 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 024/144] 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 From bf5f7d699e4633329e5fcaef241c457dce898d8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 14:32:53 +0200 Subject: [PATCH 025/144] enabled docker tests for fedora on travis --- .travis.yml | 4 +++- fedora/test_insider | 16 ++++++++++++++++ fedora/test_outsider | 3 +++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100755 fedora/test_insider create mode 100755 fedora/test_outsider diff --git a/.travis.yml b/.travis.yml index 5dc1e9ae..020afeb6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,8 @@ language: bash -script: ./bunsen/test_outsider +script: + ./fedora/test_outsider + ./bunsen/test_outsider sudo: required diff --git a/fedora/test_insider b/fedora/test_insider new file mode 100755 index 00000000..496329b8 --- /dev/null +++ b/fedora/test_insider @@ -0,0 +1,16 @@ +#!/bin/bash + +set -e + +export DONT_CHANGE_SHELL=true +export DONT_START_TOR=true + +dnf -y install sudo + +cd $HOME + +mkdir -p dev/ +cp -rv temp/dotfiles dev/ + +./dev/dotfiles/fedora/configure_fresh_system + diff --git a/fedora/test_outsider b/fedora/test_outsider new file mode 100755 index 00000000..0f43e663 --- /dev/null +++ b/fedora/test_outsider @@ -0,0 +1,3 @@ +#!/bin/bash + +docker run -v `pwd`:/root/temp/dotfiles/ fedora:24 /root/temp/dotfiles/fedora/test_insider From 08bde6d72410fdf16ef9e591b887be362f56d554 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 14:38:46 +0200 Subject: [PATCH 026/144] install git explicitely for fedora --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 560059f9..94fe4760 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -2,7 +2,7 @@ #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 gimp transmission-gtk +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 git 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 From 3053b442c33a8a64b9b940ffb59af4edfd17197a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 14:58:43 +0200 Subject: [PATCH 027/144] make working on fedora 24 --- fedora/configure_fresh_system | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 94fe4760..2fe5d9e5 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -1,8 +1,10 @@ #!/bin/bash +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 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 git +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 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 From 03fcabd6285d3c33257108746cad152bc8968ae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 15:14:40 +0200 Subject: [PATCH 028/144] make fedora installer understand DONT_START_TOR --- fedora/configure_fresh_system | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 2fe5d9e5..529b79fc 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -11,8 +11,10 @@ sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonf 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 -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/../" From 044b4bdd49968282730d5390737ce2cd91149899 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 15:38:55 +0200 Subject: [PATCH 029/144] explicitely install xz on fedora --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 529b79fc..9b7f9ecd 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,7 +4,7 @@ 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 +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 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 From 2b5e4d530b3f02f511161f27625346c9779d9aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 17:03:00 +0200 Subject: [PATCH 030/144] try to test both fedora and bunsen --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 020afeb6..c90fa488 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ language: bash script: - ./fedora/test_outsider - ./bunsen/test_outsider + - ./fedora/test_outsider + - ./bunsen/test_outsider sudo: required From a6aaed62f290075b3c6f583327d4d7e913d0970d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 21:39:51 +0200 Subject: [PATCH 031/144] chsh installed explicitely on fedora --- common/configure_fresh_system | 9 --------- fedora/configure_fresh_system | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 9b7f0007..d949971a 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -96,15 +96,6 @@ set -e cargo install rustfmt 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 export GOPATH="$HOME/go" mkdir -p "$GOPATH" diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 9b7f9ecd..fed9f69b 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,7 +4,7 @@ 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 +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 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 From ba2b1d8db27ee9c7fd8d7538de89bcfd5d5157a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 22:52:19 +0200 Subject: [PATCH 032/144] try launching fedora and bunsen builds as separate travis jobs --- .travis.yml | 7 +++++-- test | 9 +++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) create mode 100755 test diff --git a/.travis.yml b/.travis.yml index c90fa488..52b392a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,11 @@ language: bash script: - - ./fedora/test_outsider - - ./bunsen/test_outsider + - ./test + +env: + - DETECTED_OS=fedora + - DETECTED_OS=bunsen sudo: required diff --git a/test b/test new file mode 100755 index 00000000..5455762a --- /dev/null +++ b/test @@ -0,0 +1,9 @@ +#!/bin/bash + +if [[ -z $DETECTED_OS ]]; then + echo "cannot detect OS, please set DETECTED_OS manually" + exit 1 +fi + +./$DETECTED_OS/configure_fresh_system + From 6d264f77c35446b785f1c57006efd7149b6316ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 1 Jul 2016 22:55:05 +0200 Subject: [PATCH 033/144] corrected path to dockerized tests in travis --- .travis.yml | 3 ++- test | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 52b392a2..82c8aa76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,5 @@ -language: bash +language: + - bash script: - ./test diff --git a/test b/test index 5455762a..24ad174e 100755 --- a/test +++ b/test @@ -5,5 +5,5 @@ if [[ -z $DETECTED_OS ]]; then exit 1 fi -./$DETECTED_OS/configure_fresh_system +./$DETECTED_OS/test_outsider From a882fbc1e2eb21687fd0224d7a3bae8d09c941db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Tue, 5 Jul 2016 11:39:13 +0200 Subject: [PATCH 034/144] initial ubuntu support, backported over from bunsen --- .travis.yml | 1 + ubuntu/configure_fresh_system | 40 +++++++++++++++++++++++++++++------ ubuntu/test_insider | 19 +++++++++++++++++ ubuntu/test_outsider | 3 +++ 4 files changed, 56 insertions(+), 7 deletions(-) create mode 100755 ubuntu/test_insider create mode 100755 ubuntu/test_outsider diff --git a/.travis.yml b/.travis.yml index 82c8aa76..b20207b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ script: env: - DETECTED_OS=fedora - DETECTED_OS=bunsen + - DETECTED_OS=ubuntu sudo: required diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system index c5fc4939..d1702c7d 100755 --- a/ubuntu/configure_fresh_system +++ b/ubuntu/configure_fresh_system @@ -1,18 +1,44 @@ #!/bin/bash -# detect if building inside a CI system, like Travis -echo "choosing the more interactive installation method" -COMMAND_PREFIX="apt-get -y"; + set -e +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 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 gnupg2 realpath apt-file" -UPGRADE_COMMAND="sudo $COMMAND_PREFIX dist-upgrade" -eval ${UPGRADE_COMMAND} +set +e +for i in `seq 1 3`; do + eval $install_packages +done -INSTALL_COMMAND="sudo $COMMAND_PREFIX install meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra aptitude p7zip-full p7zip-rar thunderbird mercurial kdiff3 gnupg2 python3-setuptools aircrack-ng macchanger realpath python3-dev python3 python3-pip apt-file" -eval ${INSTALL_COMMAND} +set -e +eval $install_packages + +if [[ -z $DONT_START_TOR ]]; 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 +# install vim from sources +VIM_BUILD_DIR=/tmp +cd "$VIM_BUILD_DIR" +git clone https://github.com/vim/vim.git +cd vim +./configure --with-features=huge \ + --enable-multibyte \ + --enable-rubyinterp \ + --enable-pythoninterp \ + --with-python-config-dir=/usr/lib/python2.7/config-x86_64-linux-gnu \ + --enable-perlinterp \ + --enable-luainterp \ + --enable-gui=gtk2 --enable-cscope --prefix=/usr +make -j2 +sudo make install +cd +rm -fvr "$VIM_BUILD_DIR/vim" + diff --git a/ubuntu/test_insider b/ubuntu/test_insider new file mode 100755 index 00000000..55aa9929 --- /dev/null +++ b/ubuntu/test_insider @@ -0,0 +1,19 @@ +#!/bin/bash + +set -e + +export DEBIAN_FRONTEND=noninteractive +export DONT_CHANGE_SHELL=true +export DONT_START_TOR=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/configure_fresh_system + diff --git a/ubuntu/test_outsider b/ubuntu/test_outsider new file mode 100755 index 00000000..8bce97bf --- /dev/null +++ b/ubuntu/test_outsider @@ -0,0 +1,3 @@ +#!/bin/bash + +docker run -v `pwd`:/root/temp/dotfiles/ ubuntu:xenial /root/temp/dotfiles/ubuntu/test_insider From c0fb1fec3f7045b26044c3dd650b66b7678ae1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Tue, 5 Jul 2016 11:40:08 +0200 Subject: [PATCH 035/144] wine seems to have broken dependencies on xenial, removing for now --- 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 d1702c7d..c46fdc3a 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 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 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 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" set +e for i in `seq 1 3`; do From 79512e67dc53c01038c9e37d26204b4bb2956ee7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Tue, 5 Jul 2016 12:02:52 +0200 Subject: [PATCH 036/144] do not install vim from sources on ubuntu, as the one provided is recent enough --- ubuntu/configure_fresh_system | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system index c46fdc3a..713b12bc 100755 --- a/ubuntu/configure_fresh_system +++ b/ubuntu/configure_fresh_system @@ -23,22 +23,3 @@ 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 -cd "$VIM_BUILD_DIR" -git clone https://github.com/vim/vim.git -cd vim -./configure --with-features=huge \ - --enable-multibyte \ - --enable-rubyinterp \ - --enable-pythoninterp \ - --with-python-config-dir=/usr/lib/python2.7/config-x86_64-linux-gnu \ - --enable-perlinterp \ - --enable-luainterp \ - --enable-gui=gtk2 --enable-cscope --prefix=/usr -make -j2 -sudo make install -cd -rm -fvr "$VIM_BUILD_DIR/vim" - From 4b4e54c319adfb23bc70224856354809dbfe5dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Tue, 5 Jul 2016 15:32:12 +0200 Subject: [PATCH 037/144] 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 eb3f5d35652f5935ed6291a98de474adb660e15c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 8 Jul 2016 13:43:49 +0200 Subject: [PATCH 038/144] use new cargo's switch to install or update packages when present --- common/configure_fresh_system | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index d949971a..c018ac1e 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -89,12 +89,8 @@ else git pull fi -set +e -cargo uninstall rustfmt -cargo uninstall racer -set -e -cargo install rustfmt -cargo install racer +cargo install -f rustfmt +cargo install -f racer # go export GOPATH="$HOME/go" From 185f6d0f54d6f42742c7e9bc2088b2f3d69e9d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 08:32:18 +0200 Subject: [PATCH 039/144] YCM update --- .vim/bundle/YouCompleteMe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe index 94ec3ed9..c4a410b2 160000 --- a/.vim/bundle/YouCompleteMe +++ b/.vim/bundle/YouCompleteMe @@ -1 +1 @@ -Subproject commit 94ec3ed902e4e55b1766232d3b0e7d602bc2c472 +Subproject commit c4a410b2ca3a6222c7e196c10f258f6e672f31a9 From a1f99954bb35851ec6b05231fe249125f51e4dd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 08:33:37 +0200 Subject: [PATCH 040/144] racer-vim update --- .vim/bundle/racer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vim/bundle/racer b/.vim/bundle/racer index 063094b9..f877a066 160000 --- a/.vim/bundle/racer +++ b/.vim/bundle/racer @@ -1 +1 @@ -Subproject commit 063094b977ce6c415f91e939626f334982c0a0a3 +Subproject commit f877a066cda349f8747a8d2de3ca7bcb4603dcfb From ac3fb7598c0ce7509efb69ed02e4700093a94e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 08:36:05 +0200 Subject: [PATCH 041/144] syntastic update --- .vim/bundle/vim-syntastic | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vim/bundle/vim-syntastic b/.vim/bundle/vim-syntastic index 64cce208..87f3e80b 160000 --- a/.vim/bundle/vim-syntastic +++ b/.vim/bundle/vim-syntastic @@ -1 +1 @@ -Subproject commit 64cce208388c10debd5b150de08d9be371bd0e86 +Subproject commit 87f3e80b443870ce821f82dd1b3dba5bd66b51b2 From d9eaceb27729045ef357e92c232b08d84ad3148f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 09:28:30 +0200 Subject: [PATCH 042/144] do a recursive fetch for rust sources --- common/configure_fresh_system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index c018ac1e..6cc8ed2c 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -1,7 +1,6 @@ #!/bin/bash set -e -set -v echo echo "configuring settings common among OSes" sudo true @@ -83,10 +82,11 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib cd "$DIR/../" echo "getting rust sources..." if [[ ! -d rust ]]; then - git clone https://github.com/rust-lang/rust.git + git clone https://github.com/rust-lang/rust.git --recursive else cd rust git pull + git submodule update --init --recursive fi cargo install -f rustfmt From 3c7cdce9e7a4dcc0455e02ceb470494931908a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 10:47:51 +0200 Subject: [PATCH 043/144] benice alias added --- .zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.zshrc b/.zshrc index 924388c3..d5eba57f 100644 --- a/.zshrc +++ b/.zshrc @@ -45,6 +45,8 @@ else alias tscp="torsocks scp" fi +alias benice="ionice -c3 nice -n20" + # env vars source ~/.setenv From b3939dd8111f52506b05a28209cd2e24500b1a9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 11:15:30 +0200 Subject: [PATCH 044/144] build all compelters for YCM --- common/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 6cc8ed2c..5dd0105f 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -45,7 +45,7 @@ source ~/.setenv cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive -python install.py --clang-completer +./install.py --all # symlink 'nodejs' as node on some systems # will replace symlink if it exists, but won't replace regular file From f8d88d67a64e0af6e822f0884018e8a494d506c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 11:18:06 +0200 Subject: [PATCH 045/144] enable clang and racer explicitely for YCM --- common/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 5dd0105f..a4dd094a 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -45,7 +45,7 @@ source ~/.setenv cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive -./install.py --all +./install.py --racer-completer --clang-completer # symlink 'nodejs' as node on some systems # will replace symlink if it exists, but won't replace regular file From 80d45b604346452e7b9fad012d7727945cfc5260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 11:21:52 +0200 Subject: [PATCH 046/144] move YCM to be built after rust and racer are already installed --- common/configure_fresh_system | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index a4dd094a..4f778453 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -43,10 +43,6 @@ ln -vfs "$DIR/.config/redshift.conf" ~/.config/redshift.conf source ~/.setenv -cd "$DIR/.vim/bundle/YouCompleteMe/" -git submodule update --init --recursive -./install.py --racer-completer --clang-completer - # symlink 'nodejs' as node on some systems # will replace symlink if it exists, but won't replace regular file if [[ ! -f /usr/bin/node ]]; then @@ -92,6 +88,10 @@ fi cargo install -f rustfmt cargo install -f racer +cd "$DIR/.vim/bundle/YouCompleteMe/" +git submodule update --init --recursive +./install.py --racer-completer --clang-completer + # go export GOPATH="$HOME/go" mkdir -p "$GOPATH" From 6033245203f35096f1f31da50324d76a4c140ebd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 11:35:41 +0200 Subject: [PATCH 047/144] do not use vim-racer nor install racer globally anymore, use YCM for completion solely --- .gitmodules | 3 --- .vim/bundle/racer | 1 - common/configure_fresh_system | 1 - fedora/configure_fresh_system | 2 +- 4 files changed, 1 insertion(+), 6 deletions(-) delete mode 160000 .vim/bundle/racer diff --git a/.gitmodules b/.gitmodules index 7799fb56..51cc99c1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -53,9 +53,6 @@ [submodule ".vim/bundle/rust.vim"] path = .vim/bundle/rust.vim url = https://github.com/rust-lang/rust.vim.git -[submodule ".vim/bundle/racer"] - path = .vim/bundle/racer - url = https://github.com/phildawes/racer.git [submodule ".vim/bundle/YouCompleteMe"] path = .vim/bundle/YouCompleteMe url = https://github.com/Valloric/YouCompleteMe.git diff --git a/.vim/bundle/racer b/.vim/bundle/racer deleted file mode 160000 index f877a066..00000000 --- a/.vim/bundle/racer +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f877a066cda349f8747a8d2de3ca7bcb4603dcfb diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 4f778453..f7e48c1d 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -86,7 +86,6 @@ else fi cargo install -f rustfmt -cargo install -f racer cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index fed9f69b..421decfa 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -8,7 +8,7 @@ sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderb 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 +sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs sudo dnf -y groupinstall "C Development Tools and Libraries" if [[ -z $DONT_START_TOR ]]; then From 042eb6f308e41afba9c7285e7f8b13b4d6b9961a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 12:27:33 +0200 Subject: [PATCH 048/144] map ycm-goto to `,g` --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 7284ed47..28b29041 100755 --- a/.vimrc +++ b/.vimrc @@ -20,6 +20,9 @@ nmap t :wa :Make test " navigate buffers by ctrl-b nmap :bprevious +" YCM +nnoremap g :YcmCompleter GoTo + nnoremap ; : " no cheating ! From b9b9ec18fa3233d289fa366da709478b823fe158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 12:57:56 +0200 Subject: [PATCH 049/144] Vundle used to install Vundle --- .gitignore | 3 +- .gitmodules | 7 +- .vim/autoload/pathogen.vim | 326 ------------------------------- .vim/bundle/Vundle.vim | 1 + .vim/bundle/vim-colors-solarized | 1 - .vimrc | 17 +- common/configure_fresh_system | 2 + 7 files changed, 23 insertions(+), 334 deletions(-) delete mode 100644 .vim/autoload/pathogen.vim create mode 160000 .vim/bundle/Vundle.vim delete mode 160000 .vim/bundle/vim-colors-solarized diff --git a/.gitignore b/.gitignore index d2907491..d3ddc045 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .vim/undo/ .vim/.netrwhist - +.vim/bundle/* +!.vim/bundle/Vundle.vim diff --git a/.gitmodules b/.gitmodules index 51cc99c1..0e19dc7a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,10 +22,6 @@ [submodule ".vim/bundle/vim-gitgutter"] path = .vim/bundle/vim-gitgutter url = https://github.com/airblade/vim-gitgutter -[submodule ".vim/bundle/vim-colors-solarized"] - path = .vim/bundle/vim-colors-solarized - url = https://github.com/cyplo/vim-colors-solarized.git - [submodule ".oh-my-zsh"] path = .oh-my-zsh url = git://github.com/robbyrussell/oh-my-zsh.git @@ -65,3 +61,6 @@ [submodule ".vim/bundle/vim-dispatch"] path = .vim/bundle/vim-dispatch url = https://github.com/tpope/vim-dispatch.git +[submodule ".vim/bundle/Vundle.vim"] + path = .vim/bundle/Vundle.vim + url = https://github.com/VundleVim/Vundle.vim.git diff --git a/.vim/autoload/pathogen.vim b/.vim/autoload/pathogen.vim deleted file mode 100644 index 7b89ccaf..00000000 --- a/.vim/autoload/pathogen.vim +++ /dev/null @@ -1,326 +0,0 @@ -" pathogen.vim - path option manipulation -" Maintainer: Tim Pope -" Version: 2.2 - -" Install in ~/.vim/autoload (or ~\vimfiles\autoload). -" -" For management of individually installed plugins in ~/.vim/bundle (or -" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your -" .vimrc is the only other setup necessary. -" -" The API is documented inline below. For maximum ease of reading, -" :set foldmethod=marker - -if exists("g:loaded_pathogen") || &cp - finish -endif -let g:loaded_pathogen = 1 - -function! s:warn(msg) - echohl WarningMsg - echomsg a:msg - echohl NONE -endfunction - -" Point of entry for basic default usage. Give a relative path to invoke -" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke -" pathogen#surround(). For backwards compatibility purposes, a full path that -" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories() -" instead. -function! pathogen#infect(...) abort " {{{1 - for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}'] - if path =~# '^[^\\/]\+$' - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#incubate(path . '/{}') - elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$' - call pathogen#incubate(path) - elseif path =~# '[\\/]\%({}\|\*\)$' - call pathogen#surround(path) - else - call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')') - call pathogen#surround(path . '/{}') - endif - endfor - call pathogen#cycle_filetype() - return '' -endfunction " }}}1 - -" Split a path into a list. -function! pathogen#split(path) abort " {{{1 - if type(a:path) == type([]) | return a:path | endif - let split = split(a:path,'\\\@"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags')) - silent! execute 'helptags' pathogen#fnameescape(dir.'/doc') - endif - endfor - endfor -endfunction " }}}1 - -command! -bar Helptags :call pathogen#helptags() - -" Execute the given command. This is basically a backdoor for --remote-expr. -function! pathogen#execute(...) abort " {{{1 - for command in a:000 - execute command - endfor - return '' -endfunction " }}}1 - -" Like findfile(), but hardcoded to use the runtimepath. -function! pathogen#runtime_findfile(file,count) abort "{{{1 - let rtp = pathogen#join(1,pathogen#split(&rtp)) - let file = findfile(a:file,rtp,a:count) - if file ==# '' - return '' - else - return fnamemodify(file,':p') - endif -endfunction " }}}1 - -" Backport of fnameescape(). -function! pathogen#fnameescape(string) abort " {{{1 - if exists('*fnameescape') - return fnameescape(a:string) - elseif a:string ==# '-' - return '\-' - else - return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','') - endif -endfunction " }}}1 - -if exists(':Vedit') - finish -endif - -let s:vopen_warning = 0 - -function! s:find(count,cmd,file,lcd) " {{{1 - let rtp = pathogen#join(1,pathogen#split(&runtimepath)) - let file = pathogen#runtime_findfile(a:file,a:count) - if file ==# '' - return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'" - endif - if !s:vopen_warning - let s:vopen_warning = 1 - let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE' - else - let warning = '' - endif - if a:lcd - let path = file[0:-strlen(a:file)-2] - execute 'lcd `=path`' - return a:cmd.' '.pathogen#fnameescape(a:file) . warning - else - return a:cmd.' '.pathogen#fnameescape(file) . warning - endif -endfunction " }}}1 - -function! s:Findcomplete(A,L,P) " {{{1 - let sep = pathogen#separator() - let cheats = { - \'a': 'autoload', - \'d': 'doc', - \'f': 'ftplugin', - \'i': 'indent', - \'p': 'plugin', - \'s': 'syntax'} - if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0]) - let request = cheats[a:A[0]].a:A[1:-1] - else - let request = a:A - endif - let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*' - let found = {} - for path in pathogen#split(&runtimepath) - let path = expand(path, ':p') - let matches = split(glob(path.sep.pattern),"\n") - call map(matches,'isdirectory(v:val) ? v:val.sep : v:val') - call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]') - for match in matches - let found[match] = 1 - endfor - endfor - return sort(keys(found)) -endfunction " }}}1 - -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(,'edit',,0) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(,'edit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(,'split',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(,'vsplit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(,'tabedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(,'pedit',,1) -command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(,'read',,1) - -" vim:set et sw=2: diff --git a/.vim/bundle/Vundle.vim b/.vim/bundle/Vundle.vim new file mode 160000 index 00000000..49847675 --- /dev/null +++ b/.vim/bundle/Vundle.vim @@ -0,0 +1 @@ +Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45 diff --git a/.vim/bundle/vim-colors-solarized b/.vim/bundle/vim-colors-solarized deleted file mode 160000 index b1f234b8..00000000 --- a/.vim/bundle/vim-colors-solarized +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b1f234b8aa879a8276fc2c73c99ec68d7635de96 diff --git a/.vimrc b/.vimrc index 28b29041..1c24ac65 100755 --- a/.vimrc +++ b/.vimrc @@ -48,8 +48,21 @@ set shiftwidth=4 set expandtab " plugins -execute pathogen#infect() -filetype plugin indent on + +filetype off + +" set the runtime path to include Vundle and initialize +set rtp+=~/.vim/bundle/Vundle.vim +call vundle#begin() + +" let Vundle manage Vundle, required +Plugin 'VundleVim/Vundle.vim' + +Plugin 'https://github.com/cyplo/vim-colors-solarized.git' + +call vundle#end() " required +filetype plugin indent on " required + " colours [need pathogen] set t_Co=256 diff --git a/common/configure_fresh_system b/common/configure_fresh_system index f7e48c1d..4fc49505 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -87,6 +87,8 @@ fi cargo install -f rustfmt +echo "\n" | vim +PluginInstall +qa + cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive ./install.py --racer-completer --clang-completer From 1c8547ab2d5e03c477a91fd2395d8a42984028ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 13:21:42 +0200 Subject: [PATCH 050/144] moved all plugins to vundle --- .gitmodules | 42 --------------------------------------- .vim/bundle/ack.vim | 1 - .vim/bundle/nerdtree | 1 - .vim/bundle/rust.vim | 1 - .vim/bundle/salt-vim | 1 - .vim/bundle/splice | 1 - .vim/bundle/vim-airline | 1 - .vim/bundle/vim-cargo | 1 - .vim/bundle/vim-ctrlp | 1 - .vim/bundle/vim-dirdiff | 1 - .vim/bundle/vim-dispatch | 1 - .vim/bundle/vim-fugitive | 1 - .vim/bundle/vim-gitgutter | 1 - .vim/bundle/vim-markdown | 1 - .vim/bundle/vim-syntastic | 1 - .vimrc | 23 +++++++++++++++------ 16 files changed, 17 insertions(+), 62 deletions(-) delete mode 160000 .vim/bundle/ack.vim delete mode 160000 .vim/bundle/nerdtree delete mode 160000 .vim/bundle/rust.vim delete mode 160000 .vim/bundle/salt-vim delete mode 160000 .vim/bundle/splice delete mode 160000 .vim/bundle/vim-airline delete mode 160000 .vim/bundle/vim-cargo delete mode 160000 .vim/bundle/vim-ctrlp delete mode 160000 .vim/bundle/vim-dirdiff delete mode 160000 .vim/bundle/vim-dispatch delete mode 160000 .vim/bundle/vim-fugitive delete mode 160000 .vim/bundle/vim-gitgutter delete mode 160000 .vim/bundle/vim-markdown delete mode 160000 .vim/bundle/vim-syntastic diff --git a/.gitmodules b/.gitmodules index 0e19dc7a..9af3214b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,24 @@ -[submodule ".vim/bundle/vim-fugitive"] - path = .vim/bundle/vim-fugitive - url = http://github.com/tpope/vim-fugitive -[submodule ".vim/bundle/vim-markdown"] - path = .vim/bundle/vim-markdown - url = https://github.com/plasticboy/vim-markdown.git [submodule ".vim/bundle/vim-powerline"] path = .vim/bundle/vim-powerline url = https://github.com/Lokaltog/vim-powerline.git -[submodule ".vim/bundle/vim-syntastic"] - path = .vim/bundle/vim-syntastic - url = https://github.com/scrooloose/syntastic [submodule "cygwin/mintty-colors-solarized"] path = cygwin/mintty-colors-solarized url = https://github.com/mavnn/mintty-colors-solarized.git -[submodule ".vim/bundle/salt-vim"] - path = .vim/bundle/salt-vim - url = https://github.com/saltstack/salt-vim.git -[submodule ".vim/bundle/vim-airline"] - path = .vim/bundle/vim-airline - url = https://github.com/bling/vim-airline -[submodule ".vim/bundle/vim-gitgutter"] - path = .vim/bundle/vim-gitgutter - url = https://github.com/airblade/vim-gitgutter [submodule ".oh-my-zsh"] path = .oh-my-zsh url = git://github.com/robbyrussell/oh-my-zsh.git -[submodule ".vim/bundle/nerdtree"] - path = .vim/bundle/nerdtree - url = https://github.com/scrooloose/nerdtree -[submodule ".vim/bundle/vim-ctrlp"] - path = .vim/bundle/vim-ctrlp - url = https://github.com/kien/ctrlp.vim.git [submodule "tools/icdiff.git"] path = tools/icdiff.git url = https://github.com/jeffkaufman/icdiff.git -[submodule ".vim/bundle/splice"] - path = .vim/bundle/splice - url = https://github.com/sjl/splice.vim.git -[submodule ".vim/bundle/vim-dirdiff"] - path = .vim/bundle/vim-dirdiff - url = git://github.com/will133/vim-dirdiff [submodule "tools/subuser"] path = tools/subuser url = https://github.com/subuser-security/subuser [submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"] path = .oh-my-zsh-plugins/zsh-syntax-highlighting url = git://github.com/zsh-users/zsh-syntax-highlighting.git -[submodule ".vim/bundle/rust.vim"] - path = .vim/bundle/rust.vim - url = https://github.com/rust-lang/rust.vim.git [submodule ".vim/bundle/YouCompleteMe"] path = .vim/bundle/YouCompleteMe url = https://github.com/Valloric/YouCompleteMe.git -[submodule ".vim/bundle/ack.vim"] - path = .vim/bundle/ack.vim - url = https://github.com/mileszs/ack.vim.git -[submodule ".vim/bundle/vim-cargo"] - path = .vim/bundle/vim-cargo - url = https://github.com/timonv/vim-cargo.git -[submodule ".vim/bundle/vim-dispatch"] - path = .vim/bundle/vim-dispatch - url = https://github.com/tpope/vim-dispatch.git [submodule ".vim/bundle/Vundle.vim"] path = .vim/bundle/Vundle.vim url = https://github.com/VundleVim/Vundle.vim.git diff --git a/.vim/bundle/ack.vim b/.vim/bundle/ack.vim deleted file mode 160000 index 0a7d28bf..00000000 --- a/.vim/bundle/ack.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0a7d28bfb130696f73d122cac99d8903e066c896 diff --git a/.vim/bundle/nerdtree b/.vim/bundle/nerdtree deleted file mode 160000 index f8fd2ecc..00000000 --- a/.vim/bundle/nerdtree +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f8fd2ecce20f5005e6313ce57d6d2a209890c946 diff --git a/.vim/bundle/rust.vim b/.vim/bundle/rust.vim deleted file mode 160000 index 115d321d..00000000 --- a/.vim/bundle/rust.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 115d321d383eb96d438466c56cc871fcc1bd0faa diff --git a/.vim/bundle/salt-vim b/.vim/bundle/salt-vim deleted file mode 160000 index bdfd0a55..00000000 --- a/.vim/bundle/salt-vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bdfd0a558898df77aa8fc4c7b142062fdee3b2f7 diff --git a/.vim/bundle/splice b/.vim/bundle/splice deleted file mode 160000 index 4d322d82..00000000 --- a/.vim/bundle/splice +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4d322d823563f6fd2d72c129b1e99f5a98060fa8 diff --git a/.vim/bundle/vim-airline b/.vim/bundle/vim-airline deleted file mode 160000 index 246c2175..00000000 --- a/.vim/bundle/vim-airline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 246c217562dfd8541ee0d64600a628daa4195dd2 diff --git a/.vim/bundle/vim-cargo b/.vim/bundle/vim-cargo deleted file mode 160000 index fbf907c3..00000000 --- a/.vim/bundle/vim-cargo +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fbf907c353eaafdf4a270f66c1bb6aad767d874f diff --git a/.vim/bundle/vim-ctrlp b/.vim/bundle/vim-ctrlp deleted file mode 160000 index b5d3fe66..00000000 --- a/.vim/bundle/vim-ctrlp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f diff --git a/.vim/bundle/vim-dirdiff b/.vim/bundle/vim-dirdiff deleted file mode 160000 index 779185c3..00000000 --- a/.vim/bundle/vim-dirdiff +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 779185c33cccada094f59aa1345ffe19d2e581e4 diff --git a/.vim/bundle/vim-dispatch b/.vim/bundle/vim-dispatch deleted file mode 160000 index 5f5c22c9..00000000 --- a/.vim/bundle/vim-dispatch +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5f5c22c9ed48ee64fc5f02ac3acd543b97732fe8 diff --git a/.vim/bundle/vim-fugitive b/.vim/bundle/vim-fugitive deleted file mode 160000 index 0374322b..00000000 --- a/.vim/bundle/vim-fugitive +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0374322ba5d85ae44dd9dc44ef31ca015a59097e diff --git a/.vim/bundle/vim-gitgutter b/.vim/bundle/vim-gitgutter deleted file mode 160000 index 39f01190..00000000 --- a/.vim/bundle/vim-gitgutter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 39f011909620e0c7ae555efdace20c3963ac88af diff --git a/.vim/bundle/vim-markdown b/.vim/bundle/vim-markdown deleted file mode 160000 index 74c9c607..00000000 --- a/.vim/bundle/vim-markdown +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 74c9c60796ef10284ba26aaf38ffb39beae5f62c diff --git a/.vim/bundle/vim-syntastic b/.vim/bundle/vim-syntastic deleted file mode 160000 index 87f3e80b..00000000 --- a/.vim/bundle/vim-syntastic +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 87f3e80b443870ce821f82dd1b3dba5bd66b51b2 diff --git a/.vimrc b/.vimrc index 1c24ac65..446283a4 100755 --- a/.vimrc +++ b/.vimrc @@ -51,20 +51,31 @@ set expandtab filetype off -" set the runtime path to include Vundle and initialize set rtp+=~/.vim/bundle/Vundle.vim call vundle#begin() -" let Vundle manage Vundle, required Plugin 'VundleVim/Vundle.vim' Plugin 'https://github.com/cyplo/vim-colors-solarized.git' +Plugin 'mileszs/ack.vim' +Plugin 'scrooloose/nerdtree.git' +Plugin 'scrooloose/syntastic.git' +Plugin 'wting/rust.vim' +Plugin 'sjl/splice.vim.git' +Plugin 'vim-airline/vim-airline' +Plugin 'timonv/vim-cargo' +Plugin 'kien/ctrlp.vim' +Plugin 'will133/vim-dirdiff' +Plugin 'tpope/vim-dispatch.git' +Plugin 'tpope/vim-fugitive.git' +Plugin 'airblade/vim-gitgutter.git' +Plugin 'godlygeek/tabular' +Plugin 'plasticboy/vim-markdown' -call vundle#end() " required -filetype plugin indent on " required +call vundle#end() +filetype plugin indent on - -" colours [need pathogen] +" colours set t_Co=256 syntax enable set background=dark From b7faa66544068afba09dd548e6ff48fc2ae0be04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 13:25:48 +0200 Subject: [PATCH 051/144] remove obsolete gitmodules --- .gitmodules | 6 ------ .vim/bundle/YouCompleteMe | 1 - 2 files changed, 7 deletions(-) delete mode 160000 .vim/bundle/YouCompleteMe diff --git a/.gitmodules b/.gitmodules index 9af3214b..b7900e0e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule ".vim/bundle/vim-powerline"] - path = .vim/bundle/vim-powerline - url = https://github.com/Lokaltog/vim-powerline.git [submodule "cygwin/mintty-colors-solarized"] path = cygwin/mintty-colors-solarized url = https://github.com/mavnn/mintty-colors-solarized.git @@ -16,9 +13,6 @@ [submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"] path = .oh-my-zsh-plugins/zsh-syntax-highlighting url = git://github.com/zsh-users/zsh-syntax-highlighting.git -[submodule ".vim/bundle/YouCompleteMe"] - path = .vim/bundle/YouCompleteMe - url = https://github.com/Valloric/YouCompleteMe.git [submodule ".vim/bundle/Vundle.vim"] path = .vim/bundle/Vundle.vim url = https://github.com/VundleVim/Vundle.vim.git diff --git a/.vim/bundle/YouCompleteMe b/.vim/bundle/YouCompleteMe deleted file mode 160000 index c4a410b2..00000000 --- a/.vim/bundle/YouCompleteMe +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c4a410b2ca3a6222c7e196c10f258f6e672f31a9 From 64ff907affcda815d527dc99ef3de6769ae1447a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 13:49:54 +0200 Subject: [PATCH 052/144] added missing YCM to vundle --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index 446283a4..8aaec1e5 100755 --- a/.vimrc +++ b/.vimrc @@ -71,6 +71,7 @@ Plugin 'tpope/vim-fugitive.git' Plugin 'airblade/vim-gitgutter.git' Plugin 'godlygeek/tabular' Plugin 'plasticboy/vim-markdown' +Plugin 'Valloric/YouCompleteMe' call vundle#end() filetype plugin indent on From 0a0150e196d0afdf9406360fb966cf4171608545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 14:15:53 +0200 Subject: [PATCH 053/144] install vim before invoking the main script on bunsen --- bunsen/configure_fresh_system | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index a792e7cb..c4e9bc8d 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/configure_fresh_system @@ -1,7 +1,6 @@ #!/bin/bash set -e -set -v sudo apt-get update sudo apt-get -y upgrade @@ -20,10 +19,6 @@ if [[ -z $DONT_START_TOR ]]; then sudo systemctl start tor 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 cd "$VIM_BUILD_DIR" @@ -42,3 +37,8 @@ sudo make install cd rm -fvr "$VIM_BUILD_DIR/vim" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +DIR="$DIR/../" +DIR="$DIR" $DIR/common/configure_fresh_system + + From 1c446c781533f65c3f6e6b957f7792566f72f128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 14:37:59 +0200 Subject: [PATCH 054/144] install vim 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 713b12bc..06a7e31a 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 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" set +e for i in `seq 1 3`; do From 7d220708bb8b35525fc3796163ee4bec9bdb33f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 14:47:45 +0200 Subject: [PATCH 055/144] added airline themes to make better use of solarized colours --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index 8aaec1e5..fef8f1c3 100755 --- a/.vimrc +++ b/.vimrc @@ -63,6 +63,7 @@ Plugin 'scrooloose/syntastic.git' Plugin 'wting/rust.vim' Plugin 'sjl/splice.vim.git' Plugin 'vim-airline/vim-airline' +Plugin 'vim-airline/vim-airline-themes' Plugin 'timonv/vim-cargo' Plugin 'kien/ctrlp.vim' Plugin 'will133/vim-dirdiff' From bd519dd8c1c1483f12050c15fab96fd1530d9cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 9 Jul 2016 14:56:07 +0200 Subject: [PATCH 056/144] added tpope's sensible vim --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index fef8f1c3..912ef225 100755 --- a/.vimrc +++ b/.vimrc @@ -69,6 +69,7 @@ Plugin 'kien/ctrlp.vim' Plugin 'will133/vim-dirdiff' Plugin 'tpope/vim-dispatch.git' Plugin 'tpope/vim-fugitive.git' +Plugin 'tpope/vim-sensible' Plugin 'airblade/vim-gitgutter.git' Plugin 'godlygeek/tabular' Plugin 'plasticboy/vim-markdown' From ee4700cc7563b2e2da6a21b6edef3f5786e2c56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Tue, 12 Jul 2016 15:35:12 +0200 Subject: [PATCH 057/144] Added P4Merge and WinMerge as git diff tools on cygwin --- .gitconfig_includes.cygwin | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitconfig_includes.cygwin b/.gitconfig_includes.cygwin index cb3e6e39..2aa43a69 100644 --- a/.gitconfig_includes.cygwin +++ b/.gitconfig_includes.cygwin @@ -1,3 +1,9 @@ +[difftool "winmerge"] + cmd = 'C:/Program Files (x86)/WinMerge/WinMergeU.exe' "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" + trustExitCode = false +[difftool "p4merge"] + cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" + trustExitCode = false [mergetool "p4merge"] cmd = 'C:/Program Files/Perforce/p4merge.exe' "$(cygpath -wla $BASE)" "$(cygpath -wla $LOCAL)" "$(cygpath -wla $REMOTE)" "$(cygpath -wla $MERGED)" trustExitCode = false From 0127d2b89ae4b5230e1a0b466bf58a3b0001a4ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Tue, 19 Jul 2016 16:55:07 +0200 Subject: [PATCH 058/144] add kicad to default fedora installation --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 421decfa..956dd758 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -8,7 +8,7 @@ sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderb 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 +sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs kicad sudo dnf -y groupinstall "C Development Tools and Libraries" if [[ -z $DONT_START_TOR ]]; then From 3838c2216fb4ce43ab1c148655aa470571aaf4e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Tue, 19 Jul 2016 17:50:43 +0200 Subject: [PATCH 059/144] refresh dependencies for freecad on fedora --- fedora/install_freecad_dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/install_freecad_dependencies b/fedora/install_freecad_dependencies index 8ec3a001..4292f342 100755 --- a/fedora/install_freecad_dependencies +++ b/fedora/install_freecad_dependencies @@ -1,2 +1,2 @@ #!/bin/bash -sudo dnf install cmake doxygen swig gettext dos2unix desktop-file-utils libXmu-devel freeimage-devel mesa-libGLU-devel OCE-devel python python-devel python-pyside-devel pyside-tools boost-devel tbb-devel eigen3-devel qt-devel qt-webkit-devel ode-devel xerces-c xerces-c-devel opencv-devel smesh-devel freetype freetype-devel boost-devel Coin3-devel +sudo dnf install cmake doxygen swig gettext dos2unix desktop-file-utils libXmu-devel freeimage-devel mesa-libGLU-devel OCE-devel python python-devel python-pyside-devel pyside-tools boost-devel tbb-devel eigen3-devel qt-devel qt-webkit-devel ode-devel xerces-c xerces-c-devel opencv-devel smesh-devel freetype freetype-devel boost-devel Coin3-devel vtk-devel med-devel From ed72708959ebd468acba951e6578dd7b1b4b1d63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 24 Jul 2016 16:06:59 +0200 Subject: [PATCH 060/144] Add Virtualbox as the default provider in vagrant --- .setenv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.setenv b/.setenv index c5b25623..706c22bb 100644 --- a/.setenv +++ b/.setenv @@ -11,3 +11,5 @@ export PATH=$HOME/.cargo/bin:$PATH export RUST_SRC_PATH=$HOME/dev/rust/src export EDITOR="vim" export KEYTIMEOUT=1 +export VAGRANT_DEFAULT_PROVIDER=virtualbox + From d4c126b43352df6331ca3c771f04c78af3263481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:09:53 +0200 Subject: [PATCH 061/144] add basic scaffolding around automatic build for windows on appveyor --- appveyor.yml | 1 + windows_cygwin/build.bat | 3 +++ 2 files changed, 4 insertions(+) create mode 100644 appveyor.yml create mode 100644 windows_cygwin/build.bat diff --git a/appveyor.yml b/appveyor.yml new file mode 100644 index 00000000..2297bbeb --- /dev/null +++ b/appveyor.yml @@ -0,0 +1 @@ +build_script: windows_cygwin\build.bat diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat new file mode 100644 index 00000000..82aa5b37 --- /dev/null +++ b/windows_cygwin/build.bat @@ -0,0 +1,3 @@ +REM install Chocolatey +@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin + From f38b526e5175ce483f52c6b7de6857548675b010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:17:16 +0200 Subject: [PATCH 062/144] add browsers and cygwin to the default windows installation --- windows_cygwin/build.bat | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 82aa5b37..b53e4231 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,3 +1,9 @@ REM install Chocolatey @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin +REM install base tools +choco install firefox +choco install googlechrome + +REM install cygwin and all things inside +choco install cygwin cyg-get From b0d4ac689efddb32db20e91967897ea348dd3688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:19:05 +0200 Subject: [PATCH 063/144] drive powershell script in appveyor --- windows_cygwin/build.bat | 9 --------- windows_cygwin/build.ps1 | 9 +++++++++ 2 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 windows_cygwin/build.bat create mode 100755 windows_cygwin/build.ps1 diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat deleted file mode 100644 index b53e4231..00000000 --- a/windows_cygwin/build.bat +++ /dev/null @@ -1,9 +0,0 @@ -REM install Chocolatey -@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin - -REM install base tools -choco install firefox -choco install googlechrome - -REM install cygwin and all things inside -choco install cygwin cyg-get diff --git a/windows_cygwin/build.ps1 b/windows_cygwin/build.ps1 new file mode 100755 index 00000000..2ee0a98a --- /dev/null +++ b/windows_cygwin/build.ps1 @@ -0,0 +1,9 @@ +# install Chocolatey +iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex + +# install base tools +choco install firefox +choco install googlechrome + +# install cygwin and all things inside +choco install cygwin cyg-get From db810ad2b23e25a8f25a3df4c4bb7b9342572771 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:30:17 +0200 Subject: [PATCH 064/144] do not ask for confirmation when installing via choco --- windows_cygwin/build.ps1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/windows_cygwin/build.ps1 b/windows_cygwin/build.ps1 index 2ee0a98a..715ba0d6 100755 --- a/windows_cygwin/build.ps1 +++ b/windows_cygwin/build.ps1 @@ -2,8 +2,8 @@ iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex # install base tools -choco install firefox -choco install googlechrome +choco install -y firefox +choco install -y googlechrome # install cygwin and all things inside -choco install cygwin cyg-get +choco install -y cygwin cyg-get From b70f3ad95de31aa62d05fb57d714eb375e6fecdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:30:46 +0200 Subject: [PATCH 065/144] add missing .bat wrapper for appveyor --- windows_cygwin/build.bat | 1 + 1 file changed, 1 insertion(+) create mode 100644 windows_cygwin/build.bat diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat new file mode 100644 index 00000000..86839a21 --- /dev/null +++ b/windows_cygwin/build.bat @@ -0,0 +1 @@ +powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\build.ps1" From 9dad4b01ef1de5af4d9d0247705840819e45a494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 11:44:07 +0200 Subject: [PATCH 066/144] add cygwin git package --- windows_cygwin/build.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/windows_cygwin/build.ps1 b/windows_cygwin/build.ps1 index 715ba0d6..434d75c9 100755 --- a/windows_cygwin/build.ps1 +++ b/windows_cygwin/build.ps1 @@ -7,3 +7,6 @@ choco install -y googlechrome # install cygwin and all things inside choco install -y cygwin cyg-get + +cyg-get git + From fd4a8a7f94a6e266804a560ff3eea2ab77938bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 28 Jul 2016 16:18:32 +0200 Subject: [PATCH 067/144] add retext to fedora --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 956dd758..a379a25e 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -8,7 +8,7 @@ sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderb 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 +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 From 5521c5f9ea2eda1205af08a2fb41998a1f9a3226 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 10:37:20 +0200 Subject: [PATCH 068/144] add initial bootstrap for windows scripts --- appveyor.yml | 1 + windows_cygwin/README.md | 3 +++ windows_cygwin/bootstrap.bat | 4 ++++ 3 files changed, 8 insertions(+) create mode 100644 windows_cygwin/README.md create mode 100644 windows_cygwin/bootstrap.bat diff --git a/appveyor.yml b/appveyor.yml index 2297bbeb..8d000890 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1 +1,2 @@ +install: windows_cygwin\bootstrap.bat build_script: windows_cygwin\build.bat diff --git a/windows_cygwin/README.md b/windows_cygwin/README.md new file mode 100644 index 00000000..f94dfc59 --- /dev/null +++ b/windows_cygwin/README.md @@ -0,0 +1,3 @@ +Bootstrap from cmd.exe: + + diff --git a/windows_cygwin/bootstrap.bat b/windows_cygwin/bootstrap.bat new file mode 100644 index 00000000..6d75c9dc --- /dev/null +++ b/windows_cygwin/bootstrap.bat @@ -0,0 +1,4 @@ +@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin +refreshenv +choco install -y git win32-openssh + From 0eac6c5a624f91c0b4361c70ef08afe13b13db8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 10:53:09 +0200 Subject: [PATCH 069/144] echo commands on screen in windows bootstrap --- windows_cygwin/bootstrap.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/bootstrap.bat b/windows_cygwin/bootstrap.bat index 6d75c9dc..fb41e542 100644 --- a/windows_cygwin/bootstrap.bat +++ b/windows_cygwin/bootstrap.bat @@ -1,4 +1,4 @@ +echo on @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin -refreshenv choco install -y git win32-openssh From 944234bf6b20d3e7f8e8a5c4e8b670a7bd6d5d03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 11:00:14 +0200 Subject: [PATCH 070/144] do not use powershell script to build windows env --- windows_cygwin/build.bat | 4 +++- windows_cygwin/build.ps1 | 12 ------------ 2 files changed, 3 insertions(+), 13 deletions(-) delete mode 100755 windows_cygwin/build.ps1 diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 86839a21..ecf14db8 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1 +1,3 @@ -powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\build.ps1" +choco install -y firefox googlechrome cygwin +refreshenv + diff --git a/windows_cygwin/build.ps1 b/windows_cygwin/build.ps1 deleted file mode 100755 index 434d75c9..00000000 --- a/windows_cygwin/build.ps1 +++ /dev/null @@ -1,12 +0,0 @@ -# install Chocolatey -iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex - -# install base tools -choco install -y firefox -choco install -y googlechrome - -# install cygwin and all things inside -choco install -y cygwin cyg-get - -cyg-get git - From ebe14081fece6d2b2768b067e4da4cefdfd6a049 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 11:12:05 +0200 Subject: [PATCH 071/144] try to make bootstrap executable remotely --- appveyor.yml | 2 +- windows_cygwin/README.md | 5 +++-- windows_cygwin/bootstrap.bat | 4 ---- windows_cygwin/bootstrap.ps1 | 3 +++ 4 files changed, 7 insertions(+), 7 deletions(-) delete mode 100644 windows_cygwin/bootstrap.bat create mode 100644 windows_cygwin/bootstrap.ps1 diff --git a/appveyor.yml b/appveyor.yml index 8d000890..6800ec75 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,2 +1,2 @@ -install: windows_cygwin\bootstrap.bat +install: windows_cygwin\bootstrap.ps1 build_script: windows_cygwin\build.bat diff --git a/windows_cygwin/README.md b/windows_cygwin/README.md index f94dfc59..818bb7e2 100644 --- a/windows_cygwin/README.md +++ b/windows_cygwin/README.md @@ -1,3 +1,4 @@ -Bootstrap from cmd.exe: +Bootstrap from cmd.exe running as Administrator: - + bootstrap.bat + ssh-keygen -b 8192 diff --git a/windows_cygwin/bootstrap.bat b/windows_cygwin/bootstrap.bat deleted file mode 100644 index fb41e542..00000000 --- a/windows_cygwin/bootstrap.bat +++ /dev/null @@ -1,4 +0,0 @@ -echo on -@powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))" && SET PATH=%PATH%;%ALLUSERSPROFILE%\chocolatey\bin -choco install -y git win32-openssh - diff --git a/windows_cygwin/bootstrap.ps1 b/windows_cygwin/bootstrap.ps1 new file mode 100644 index 00000000..dbec7a91 --- /dev/null +++ b/windows_cygwin/bootstrap.ps1 @@ -0,0 +1,3 @@ +iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex +choco install -y git win32-openssh + From 1a1860c8775654dc8644a6e983970be8c32a4dda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 11:43:48 +0200 Subject: [PATCH 072/144] add all initial steps to readme for windows --- windows_cygwin/README.md | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/windows_cygwin/README.md b/windows_cygwin/README.md index 818bb7e2..cc3c8bb3 100644 --- a/windows_cygwin/README.md +++ b/windows_cygwin/README.md @@ -1,4 +1,19 @@ Bootstrap from cmd.exe running as Administrator: - bootstrap.bat + @powershell -NoProfile -ExecutionPolicy Bypass -Command "iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/cyplo/dotfiles/master/windows_cygwin/bootstrap.ps1'))" + +launch a normal user's cmd.exe and: + + refreshenv ssh-keygen -b 8192 + type .ssh\id_rsa.pub + # add this key to github + mkdir dev + cd dev + git clone git@github.com:cyplo/dotfiles.git + +launch new cmd.exe as Administrator and: + + cd %HOMEPATH%\dev\dotfiles + windows_cygwin\build.bat + From 3498e18f8c03bfa1055909b6650736c1151e4fac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:04:14 +0200 Subject: [PATCH 073/144] make cygwin install packages from the list --- windows_cygwin/build.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index ecf14db8..2eec30fe 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,3 +1,4 @@ -choco install -y firefox googlechrome cygwin +choco install -y firefox googlechrome +choco install -fy cygwin --installargs "-P curl,zsh,git,vim,wget" refreshenv From 8e11bc295760f85175bd69bffda53d1d90efc773 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:07:13 +0200 Subject: [PATCH 074/144] launch powershell explicitely on appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 6800ec75..42493a1c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,2 +1,2 @@ -install: windows_cygwin\bootstrap.ps1 +install: @powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\bootstrap.ps1" build_script: windows_cygwin\build.bat From 08188050eaee93efa373a5ae8c9f8faf82f70220 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:07:49 +0200 Subject: [PATCH 075/144] launch powershell explicitely on appveyor --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 42493a1c..58c4c013 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,2 +1,2 @@ -install: @powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\bootstrap.ps1" +install: powershell -NoProfile -ExecutionPolicy Bypass -Command "windows_cygwin\bootstrap.ps1" build_script: windows_cygwin\build.bat From 2ff4617ed8392935f92109b523d30970c48876cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:13:36 +0200 Subject: [PATCH 076/144] also upgrade cygwin packages if possible --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 2eec30fe..9b31957b 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,4 +1,4 @@ choco install -y firefox googlechrome -choco install -fy cygwin --installargs "-P curl,zsh,git,vim,wget" +choco install -fy cygwin --installargs "-Pg curl,zsh,git,vim,wget" refreshenv From 71224ec4e4269cea7cc74fd9317eea455aa0aabe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:28:40 +0200 Subject: [PATCH 077/144] do not use cygwin from chocolatey, have more control --- windows_cygwin/build.bat | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 9b31957b..8453e5a5 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,4 +1,6 @@ -choco install -y firefox googlechrome -choco install -fy cygwin --installargs "-Pg curl,zsh,git,vim,wget" +choco install -y firefox googlechrome wget refreshenv +wget https://cygwin.com/setup-x86_64.exe +REM cygwin installation +setup-x86_64 -R c:\cywin\ -Pg curl,zsh,git,vim,wget From 9b5232110ed11de9f9e8267e652177b6d097b908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:35:39 +0200 Subject: [PATCH 078/144] do not refreshenv as it exits the current batch file --- windows_cygwin/build.bat | 1 - 1 file changed, 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 8453e5a5..a9dcbf90 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,4 @@ choco install -y firefox googlechrome wget -refreshenv wget https://cygwin.com/setup-x86_64.exe REM cygwin installation setup-x86_64 -R c:\cywin\ -Pg curl,zsh,git,vim,wget From bbbfa246ff5da9e689fe71ed39055236e7bd9bca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:37:35 +0200 Subject: [PATCH 079/144] fix passing installation directory to cygwin's installer --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index a9dcbf90..d6618fd7 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ choco install -y firefox googlechrome wget wget https://cygwin.com/setup-x86_64.exe REM cygwin installation -setup-x86_64 -R c:\cywin\ -Pg curl,zsh,git,vim,wget +setup-x86_64 -R "C:\cygwin" -Pg curl,zsh,git,vim,wget From b612a5a5b038e8301b01a3bbd02f11c8e1dd7001 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:38:29 +0200 Subject: [PATCH 080/144] continue downloading cygwin's setup if interrupted or running once again --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index d6618fd7..38399adf 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ choco install -y firefox googlechrome wget -wget https://cygwin.com/setup-x86_64.exe +wget -c https://cygwin.com/setup-x86_64.exe REM cygwin installation setup-x86_64 -R "C:\cygwin" -Pg curl,zsh,git,vim,wget From b0cc712beb19d65a3c6fcee16cae0d1b5d605097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:50:53 +0200 Subject: [PATCH 081/144] fix cygwin isntaller to be noninteractive --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 38399adf..7c65121e 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ choco install -y firefox googlechrome wget wget -c https://cygwin.com/setup-x86_64.exe REM cygwin installation -setup-x86_64 -R "C:\cygwin" -Pg curl,zsh,git,vim,wget +setup-x86_64.exe -R "C:\cygwin" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget From 687cbb86cc50c445028e84fc78c4cc89caab6c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 12:53:24 +0200 Subject: [PATCH 082/144] install cygwin to cygwin64 by default --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 7c65121e..804c1e46 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ choco install -y firefox googlechrome wget wget -c https://cygwin.com/setup-x86_64.exe REM cygwin installation -setup-x86_64.exe -R "C:\cygwin" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget From efaf1b81e66bb159a248a73331ab6b97864b7430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 13:07:01 +0200 Subject: [PATCH 083/144] add archival tools to cygwin --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 804c1e46..94f1c10f 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ choco install -y firefox googlechrome wget wget -c https://cygwin.com/setup-x86_64.exe REM cygwin installation -setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion From 41e380c57c66a5397f6908cab9f8bb2c4a888219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 21:05:47 +0200 Subject: [PATCH 084/144] link in the already downloaded repo on windows --- windows_cygwin/build.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 94f1c10f..64c17db8 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -2,4 +2,6 @@ choco install -y firefox googlechrome wget wget -c https://cygwin.com/setup-x86_64.exe REM cygwin installation setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion +c:\cygwin64\bin\bash.exe --login -c "mkdir -v $HOME/dev/" +c:\cygwin64\bin\bash.exe --login -c "ln -vfs `cygpath $HOMEPATH`/dev/dotfiles $HOME/dev" From e1963ba1004ecf981b6329a36e4b1613a93c7e81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 21:08:05 +0200 Subject: [PATCH 085/144] exit common configure script if DIR not set --- common/configure_fresh_system | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 4fc49505..4ddb709a 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -13,7 +13,11 @@ fi CURL="curl -sSf" -#submodules +if [[ -z $DIR ]]; then + echo "please set DIR" + exit 1 +fi + DIR=`realpath $DIR` echo "using $DIR as the top level directory" cd $DIR From 38e40c85b913a75bf1904caf43187461b5f9cd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 21:13:01 +0200 Subject: [PATCH 086/144] do not quit if ~/dev already exists on windows --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 64c17db8..eb5006c5 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -2,6 +2,6 @@ choco install -y firefox googlechrome wget wget -c https://cygwin.com/setup-x86_64.exe REM cygwin installation setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion -c:\cygwin64\bin\bash.exe --login -c "mkdir -v $HOME/dev/" +c:\cygwin64\bin\bash.exe --login -c "mkdir -pv $HOME/dev/" c:\cygwin64\bin\bash.exe --login -c "ln -vfs `cygpath $HOMEPATH`/dev/dotfiles $HOME/dev" From 9f01f5b07b383bddffd1d393ae908a1af125ce66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 21:16:44 +0200 Subject: [PATCH 087/144] invoke common configure script from the windows build --- windows_cygwin/build.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index eb5006c5..95b8f39e 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -4,4 +4,5 @@ REM cygwin installation setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion c:\cygwin64\bin\bash.exe --login -c "mkdir -pv $HOME/dev/" c:\cygwin64\bin\bash.exe --login -c "ln -vfs `cygpath $HOMEPATH`/dev/dotfiles $HOME/dev" +c:\cygwin64\bin\bash.exe --login -c "DIR=$HOME/dev/dotfiles $DIR/common/configure_fresh_system" From c074ea7b003ba76c6b7ab89dadabdabd280371e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 21:24:10 +0200 Subject: [PATCH 088/144] do not link in the repo from windows under cygwin, clone a new one --- windows_cygwin/build.bat | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 95b8f39e..fc711368 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,8 +1,11 @@ -choco install -y firefox googlechrome wget -wget -c https://cygwin.com/setup-x86_64.exe -REM cygwin installation -setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion -c:\cygwin64\bin\bash.exe --login -c "mkdir -pv $HOME/dev/" -c:\cygwin64\bin\bash.exe --login -c "ln -vfs `cygpath $HOMEPATH`/dev/dotfiles $HOME/dev" -c:\cygwin64\bin\bash.exe --login -c "DIR=$HOME/dev/dotfiles $DIR/common/configure_fresh_system" +choco install -y firefox googlechrome wget notepadplusplus + +wget -c https://cygwin.com/setup-x86_64.exe +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion + +c:\cygwin64\bin\bash.exe --login -c "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/" +c:\cygwin64\bin\bash.exe --login -c "mkdir -pv $HOME/dev/" +c:\cygwin64\bin\bash.exe --login -c "git clone git@github.com:cyplo/dotfiles.git" + +c:\cygwin64\bin\bash.exe --login -c "export DIR=$HOME/dev/dotfiles && bash $DIR/common/configure_fresh_system" From e4ecedd64f0e1216a5c36d76aa8dc9b57c4de40e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 21:30:37 +0200 Subject: [PATCH 089/144] tell git explicitely where to clone the inner repo --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index fc711368..f0d2adda 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -5,7 +5,7 @@ setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh c:\cygwin64\bin\bash.exe --login -c "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/" c:\cygwin64\bin\bash.exe --login -c "mkdir -pv $HOME/dev/" -c:\cygwin64\bin\bash.exe --login -c "git clone git@github.com:cyplo/dotfiles.git" +c:\cygwin64\bin\bash.exe --login -c "git clone git@github.com:cyplo/dotfiles.git dev/dotfiles" c:\cygwin64\bin\bash.exe --login -c "export DIR=$HOME/dev/dotfiles && bash $DIR/common/configure_fresh_system" From ca11a4a09c7ff5e4419ae1dbfadfa364e225bc7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 21:39:07 +0200 Subject: [PATCH 090/144] introduce NOSUDO in configure scripts --- common/configure_fresh_system | 19 ++++++++++++------- windows_cygwin/build.bat | 2 +- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 4ddb709a..18dc8e4e 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -1,9 +1,14 @@ #!/bin/bash +SUDO="" +if [[ -z $NOSUDO ]]; then + SUDO=sudo +fi + set -e echo echo "configuring settings common among OSes" -sudo true +$SUDO true #zsh if [[ -z $DONT_CHANGE_SHELL ]]; then @@ -50,7 +55,7 @@ source ~/.setenv # symlink 'nodejs' as node on some systems # will replace symlink if it exists, but won't replace regular file if [[ ! -f /usr/bin/node ]]; then - sudo ln -vfs /usr/bin/nodejs /usr/bin/node + $SUDO ln -vfs /usr/bin/nodejs /usr/bin/node fi # tools @@ -66,7 +71,7 @@ mkdir -p ~/.fonts cp -rv "$DIR/fonts" ~/.fonts set +e fc-cache -rv -sudo fc-cache -rv +$SUDO fc-cache -rv set -e #rust @@ -105,12 +110,12 @@ mkdir -p "$GOPATH" go get -u github.com/exercism/cli/exercism # talks: reveal-md -sudo npm install -g reveal-md -sudo npm install -g diff-so-fancy +$SUDO npm install -g reveal-md +$SUDO npm install -g diff-so-fancy # vdir syncer echo "installing vdirsyncer" -sudo pip install vdirsyncer +$SUDO pip install vdirsyncer if [[ -z $USER ]]; then USER=`whoami` @@ -118,7 +123,7 @@ fi # normalize npm permissions mkdir -p $HOME/.npm -sudo chown $USER $HOME/.npm -R +$SUDO chown $USER $HOME/.npm -R echo echo "now go ahead and restart" diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index f0d2adda..b29d198f 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -7,5 +7,5 @@ c:\cygwin64\bin\bash.exe --login -c "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/" c:\cygwin64\bin\bash.exe --login -c "mkdir -pv $HOME/dev/" c:\cygwin64\bin\bash.exe --login -c "git clone git@github.com:cyplo/dotfiles.git dev/dotfiles" -c:\cygwin64\bin\bash.exe --login -c "export DIR=$HOME/dev/dotfiles && bash $DIR/common/configure_fresh_system" +c:\cygwin64\bin\bash.exe --login -c "export DIR=$HOME/dev/dotfiles && export NOSUDO=true && export DONT_CHANGE_SHELL=true && bash $DIR/common/configure_fresh_system" From fc926aa798536549cf387eab6c7d0bfd728e440f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 21:42:34 +0200 Subject: [PATCH 091/144] add logging around sudo decision --- common/configure_fresh_system | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 18dc8e4e..2173da42 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -2,9 +2,11 @@ SUDO="" if [[ -z $NOSUDO ]]; then - SUDO=sudo + SUDO="sudo" fi +echo "using '$SUDO' as sudo" + set -e echo echo "configuring settings common among OSes" From ff3140cba6862eee2d58ddad798d9c74691acaac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 30 Jul 2016 21:51:11 +0200 Subject: [PATCH 092/144] add missing rustup depndencies on cygwin --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index b29d198f..b82bf2d4 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,7 +1,7 @@ choco install -y firefox googlechrome wget notepadplusplus wget -c https://cygwin.com/setup-x86_64.exe -setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig c:\cygwin64\bin\bash.exe --login -c "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/" c:\cygwin64\bin\bash.exe --login -c "mkdir -pv $HOME/dev/" From db463d4adc8a322bffc489b2020941ee4dd9c9f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 31 Jul 2016 09:19:28 +0200 Subject: [PATCH 093/144] do local checkout only, when doing the second time checkout on windows --- windows_cygwin/build.bat | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index b82bf2d4..4a3bbd6b 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,11 +1,16 @@ -choco install -y firefox googlechrome wget notepadplusplus +@echo on +choco install -y firefox googlechrome wget notepadplusplus sublimetext3 wget -c https://cygwin.com/setup-x86_64.exe setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig -c:\cygwin64\bin\bash.exe --login -c "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/" -c:\cygwin64\bin\bash.exe --login -c "mkdir -pv $HOME/dev/" -c:\cygwin64\bin\bash.exe --login -c "git clone git@github.com:cyplo/dotfiles.git dev/dotfiles" +set bash=c:\cygwin64\bin\bash.exe --login -c +for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev-parse --abbrev-ref HEAD"') do set "branch=%%A" +%bash% 'echo "branch is $branch"' +%bash% "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/" +%bash% "mkdir -pv $HOME/dev/" -c:\cygwin64\bin\bash.exe --login -c "export DIR=$HOME/dev/dotfiles && export NOSUDO=true && export DONT_CHANGE_SHELL=true && bash $DIR/common/configure_fresh_system" +%bash% "git clone `cygpath $HOMEPATH`/dev/dotfiles $HOME/dev/dotfiles" +%bash% "cd $HOME/dev/dotfiles && git checkout $branch" +%bash% "export DIR=$HOME/dev/dotfiles && export NOSUDO=true && export DONT_CHANGE_SHELL=true && bash $DIR/common/configure_fresh_system" From 823d487950af4992a5811bcdf49de13b6872bc74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 31 Jul 2016 09:26:15 +0200 Subject: [PATCH 094/144] always fetch from scratch on windows --- windows_cygwin/build.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 4a3bbd6b..fc81ad80 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -8,8 +8,9 @@ set bash=c:\cygwin64\bin\bash.exe --login -c for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev-parse --abbrev-ref HEAD"') do set "branch=%%A" %bash% 'echo "branch is $branch"' %bash% "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/" -%bash% "mkdir -pv $HOME/dev/" +%bash% "mkdir -pv $HOME/dev/" +%bash% "rm -fr $HOME/dev/dotfiles" %bash% "git clone `cygpath $HOMEPATH`/dev/dotfiles $HOME/dev/dotfiles" %bash% "cd $HOME/dev/dotfiles && git checkout $branch" %bash% "export DIR=$HOME/dev/dotfiles && export NOSUDO=true && export DONT_CHANGE_SHELL=true && bash $DIR/common/configure_fresh_system" From 017e7ac5c0fdab6700018dc87462465c7aebcad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 31 Jul 2016 09:43:37 +0200 Subject: [PATCH 095/144] add NORUST option, use it under cygwin --- common/configure_fresh_system | 47 +++++++++++++++++++---------------- windows_cygwin/build.bat | 4 ++- 2 files changed, 29 insertions(+), 22 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 2173da42..8fec1245 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -76,33 +76,38 @@ fc-cache -rv $SUDO fc-cache -rv set -e -#rust -echo "installing rust" -RUSTUP_TEMP="/tmp/blastoff.sh" -$CURL https://sh.rustup.rs > "$RUSTUP_TEMP" -chmod a+x "$RUSTUP_TEMP" -"$RUSTUP_TEMP" -y -rm -f "$RUSTUP_TEMP" -rustup update -rustup default stable -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib -cd "$DIR/../" -echo "getting rust sources..." -if [[ ! -d rust ]]; then - git clone https://github.com/rust-lang/rust.git --recursive -else - cd rust - git pull - git submodule update --init --recursive +if [[ -z $NORUST ]]; then + #rust + echo "installing rust" + RUSTUP_TEMP="/tmp/blastoff.sh" + $CURL https://sh.rustup.rs > "$RUSTUP_TEMP" + chmod a+x "$RUSTUP_TEMP" + "$RUSTUP_TEMP" -y + rm -f "$RUSTUP_TEMP" + rustup update + rustup default stable + export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib + cd "$DIR/../" + echo "getting rust sources..." + if [[ ! -d rust ]]; then + git clone https://github.com/rust-lang/rust.git --recursive + else + cd rust + git pull + git submodule update --init --recursive + fi + cargo install -f rustfmt fi -cargo install -f rustfmt - echo "\n" | vim +PluginInstall +qa cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive -./install.py --racer-completer --clang-completer +if [[ -z $NORUST ]]; then + ./install.py --racer-completer --clang-completer +else + ./install.py --clang-completer +fi # go export GOPATH="$HOME/go" diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index fc81ad80..9e88f2b3 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -12,6 +12,8 @@ for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev %bash% "mkdir -pv $HOME/dev/" %bash% "rm -fr $HOME/dev/dotfiles" %bash% "git clone `cygpath $HOMEPATH`/dev/dotfiles $HOME/dev/dotfiles" +%bash% "cd $HOME/dev/dotfiles && git remote set-url origin git@github.com:cyplo/dotfiles.git" %bash% "cd $HOME/dev/dotfiles && git checkout $branch" -%bash% "export DIR=$HOME/dev/dotfiles && export NOSUDO=true && export DONT_CHANGE_SHELL=true && bash $DIR/common/configure_fresh_system" +%bash% "cd $HOME/dev/dotfiles && git pull" +%bash% "DIR=$HOME/dev/dotfiles NOSUDO=true DONT_CHANGE_SHELL=true NORUST=true $DIR/common/configure_fresh_system" From e81b51db27e41a6bbed4dc140b9cbc6f15983953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 31 Jul 2016 09:45:05 +0200 Subject: [PATCH 096/144] use export in the one-liner to launch common script under cygwin --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 9e88f2b3..b5be8569 100644 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -15,5 +15,5 @@ for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev %bash% "cd $HOME/dev/dotfiles && git remote set-url origin git@github.com:cyplo/dotfiles.git" %bash% "cd $HOME/dev/dotfiles && git checkout $branch" %bash% "cd $HOME/dev/dotfiles && git pull" -%bash% "DIR=$HOME/dev/dotfiles NOSUDO=true DONT_CHANGE_SHELL=true NORUST=true $DIR/common/configure_fresh_system" +%bash% "export DIR=$HOME/dev/dotfiles && NOSUDO=true DONT_CHANGE_SHELL=true NORUST=true $DIR/common/configure_fresh_system" From fa0fa39cdf52e2b97c06120c4b41427e896e8764 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sun, 31 Jul 2016 09:52:11 +0200 Subject: [PATCH 097/144] add appveyor build status badge --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index f30d716e..b26546c8 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Build Status](https://travis-ci.org/cyplo/dotfiles.svg?branch=master)](https://travis-ci.org/cyplo/dotfiles) +[![Build status](https://ci.appveyor.com/api/projects/status/s6i314lyti4o1ny1/branch/master?svg=true)](https://ci.appveyor.com/project/cyplo/dotfiles/branch/master) My common dotfiles for Linux, Mac and Cygwin From 018fcce82c6b10f20dd950425e8751cb29a4c4f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Mon, 1 Aug 2016 07:07:58 +0200 Subject: [PATCH 098/144] add support for automatic security updates for fedora --- fedora/configure_fresh_system | 13 ++++++++-- fedora/etc/dnf/automatic.conf | 46 +++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 fedora/etc/dnf/automatic.conf diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index a379a25e..09dbefa7 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,19 +4,28 @@ 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 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" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +cp -v /etc/dnf/automatic.conf /etc/dnf/automatic.conf.bak +cp -v $DIR/etc/dnf/automatic.conf /etc/dnf/automatic.conf +diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf + +sudo systemctl enable dnf-automatic.timer +sudo systemctl start dnf-automatic.timer +sudo systemctl list-timers "*dnf-*" + if [[ -z $DONT_START_TOR ]]; 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 diff --git a/fedora/etc/dnf/automatic.conf b/fedora/etc/dnf/automatic.conf new file mode 100644 index 00000000..848f2c09 --- /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@skinnyv + +# 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 From 2d5c36d3546be95d6ec295b523a711010e79eefe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Mon, 1 Aug 2016 07:22:07 +0200 Subject: [PATCH 099/144] do not faild the script when non-zero diff on dnf settings --- fedora/configure_fresh_system | 2 ++ fedora/etc/dnf/automatic.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 09dbefa7..af4b474e 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -15,7 +15,9 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" cp -v /etc/dnf/automatic.conf /etc/dnf/automatic.conf.bak cp -v $DIR/etc/dnf/automatic.conf /etc/dnf/automatic.conf +set +e diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf +set -e sudo systemctl enable dnf-automatic.timer sudo systemctl start dnf-automatic.timer diff --git a/fedora/etc/dnf/automatic.conf b/fedora/etc/dnf/automatic.conf index 848f2c09..d5bed173 100644 --- a/fedora/etc/dnf/automatic.conf +++ b/fedora/etc/dnf/automatic.conf @@ -30,7 +30,7 @@ emit_via = stdio,email [email] # The address to send email messages from. -email_from = root@skinnyv +email_from = root # List of addresses to send messages to. email_to = admin@cyplo.net From 4e7faebe2bfa519aaa0ddf79db3f2e9d2eb420c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Mon, 1 Aug 2016 07:29:33 +0200 Subject: [PATCH 100/144] use sudo to copy config files --- fedora/configure_fresh_system | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index af4b474e..0fdee57a 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -13,10 +13,10 @@ sudo dnf -y groupinstall "C Development Tools and Libraries" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -cp -v /etc/dnf/automatic.conf /etc/dnf/automatic.conf.bak -cp -v $DIR/etc/dnf/automatic.conf /etc/dnf/automatic.conf +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 -diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf +sudo diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf set -e sudo systemctl enable dnf-automatic.timer From 6016fc5ecc79c3f0c87909a10be26636825a0cbc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Mon, 1 Aug 2016 07:37:34 +0200 Subject: [PATCH 101/144] introduce NO_SYSTEMCTL flag --- bunsen/configure_fresh_system | 2 +- bunsen/test_insider | 2 +- fedora/configure_fresh_system | 8 ++++---- fedora/test_insider | 2 +- ubuntu/configure_fresh_system | 2 +- ubuntu/test_insider | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/bunsen/configure_fresh_system b/bunsen/configure_fresh_system index c4e9bc8d..60820f23 100755 --- a/bunsen/configure_fresh_system +++ b/bunsen/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/bunsen/test_insider index d1612fb6..8e653f4d 100755 --- a/bunsen/test_insider +++ b/bunsen/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/fedora/configure_fresh_system b/fedora/configure_fresh_system index 0fdee57a..b7089cd7 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -19,11 +19,11 @@ set +e sudo diff /etc/dnf/automatic.conf.bak /etc/dnf/automatic.conf set -e -sudo systemctl enable dnf-automatic.timer -sudo systemctl start dnf-automatic.timer -sudo systemctl list-timers "*dnf-*" +if [[ -z $NO_SYSTEMCTL ]]; then + sudo systemctl enable dnf-automatic.timer + sudo systemctl start dnf-automatic.timer + sudo systemctl list-timers "*dnf-*" -if [[ -z $DONT_START_TOR ]]; then sudo systemctl enable tor sudo systemctl start tor fi 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/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system index 06a7e31a..ec8b0a9b 100755 --- a/ubuntu/configure_fresh_system +++ b/ubuntu/configure_fresh_system @@ -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 From ab7046d8b92a8acf5f9ec4a9e45ebde070e6ce02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 4 Aug 2016 11:21:31 +0200 Subject: [PATCH 102/144] separated the insider script for in-cygwin execution --- windows_cygwin/build.bat | 13 ++++--------- windows_cygwin/build_insider.sh | 13 +++++++++++++ 2 files changed, 17 insertions(+), 9 deletions(-) mode change 100644 => 100755 windows_cygwin/build.bat create mode 100755 windows_cygwin/build_insider.sh diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat old mode 100644 new mode 100755 index b5be8569..5e57d0c8 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -4,16 +4,11 @@ choco install -y firefox googlechrome wget notepadplusplus sublimetext3 wget -c https://cygwin.com/setup-x86_64.exe setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig +set script_path=%~dp0 +set repo_path=%script_path%\..\ set bash=c:\cygwin64\bin\bash.exe --login -c + for /f "delims=" %%A in ('%bash% "cd `cygpath $HOMEPATH`/dev/dotfiles && git rev-parse --abbrev-ref HEAD"') do set "branch=%%A" %bash% 'echo "branch is $branch"' %bash% "cp -vr `cygpath $HOMEPATH`/.ssh $HOME/" - -%bash% "mkdir -pv $HOME/dev/" -%bash% "rm -fr $HOME/dev/dotfiles" -%bash% "git clone `cygpath $HOMEPATH`/dev/dotfiles $HOME/dev/dotfiles" -%bash% "cd $HOME/dev/dotfiles && git remote set-url origin git@github.com:cyplo/dotfiles.git" -%bash% "cd $HOME/dev/dotfiles && git checkout $branch" -%bash% "cd $HOME/dev/dotfiles && git pull" -%bash% "export DIR=$HOME/dev/dotfiles && NOSUDO=true DONT_CHANGE_SHELL=true NORUST=true $DIR/common/configure_fresh_system" - +%bash% "export OUTER_CLONE=`cygpath $repo_path` && $script_path/build_insider.sh" diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh new file mode 100755 index 00000000..6987aae9 --- /dev/null +++ b/windows_cygwin/build_insider.sh @@ -0,0 +1,13 @@ +#!/bin/bash + +DOTFILES_PATH="$HOME/dev/dotfiles" +mkdir -pv $HOME/dev/ +rm -fr $DOTFILES_PATH + +git clone "$OUTER_CLONE" "$DOTFILES_PATH" +cd "$DOTFILES_PATH" +git remote set-url origin git@github.com:cyplo/dotfiles.git +git checkout $branch +git pull +export DIR=$DOTFILES_PATH && NOSUDO=true DONT_CHANGE_SHELL=true NORUST=true $DIR/common/configure_fresh_system" + From 9a706ac31248ff8b19c30ec6923e8abbbffd03aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 4 Aug 2016 11:29:27 +0200 Subject: [PATCH 103/144] do not force pull for the repo inside cygwin --- windows_cygwin/build_insider.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh index 6987aae9..7628d19f 100755 --- a/windows_cygwin/build_insider.sh +++ b/windows_cygwin/build_insider.sh @@ -8,6 +8,5 @@ git clone "$OUTER_CLONE" "$DOTFILES_PATH" cd "$DOTFILES_PATH" git remote set-url origin git@github.com:cyplo/dotfiles.git git checkout $branch -git pull export DIR=$DOTFILES_PATH && NOSUDO=true DONT_CHANGE_SHELL=true NORUST=true $DIR/common/configure_fresh_system" From ccd03d201bb829fac3815f9afe9f09d616f06139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 4 Aug 2016 11:35:31 +0200 Subject: [PATCH 104/144] fix typo in the cygwin build insider script --- windows_cygwin/build_insider.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh index 7628d19f..af848088 100755 --- a/windows_cygwin/build_insider.sh +++ b/windows_cygwin/build_insider.sh @@ -8,5 +8,5 @@ git clone "$OUTER_CLONE" "$DOTFILES_PATH" cd "$DOTFILES_PATH" git remote set-url origin git@github.com:cyplo/dotfiles.git git checkout $branch -export DIR=$DOTFILES_PATH && NOSUDO=true DONT_CHANGE_SHELL=true NORUST=true $DIR/common/configure_fresh_system" +export DIR=$DOTFILES_PATH && NOSUDO=true DONT_CHANGE_SHELL=true NORUST=true $DIR/common/configure_fresh_system From bb2c2ed44a44a87b60add3962b69ac6a53ed1856 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 4 Aug 2016 12:50:30 +0200 Subject: [PATCH 105/144] added clang to cygwin --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 5e57d0c8..b199bca1 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -2,7 +2,7 @@ choco install -y firefox googlechrome wget notepadplusplus sublimetext3 wget -c https://cygwin.com/setup-x86_64.exe -setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang set script_path=%~dp0 set repo_path=%script_path%\..\ From a3d9c6b7814affa1a0c1146fee9333fde52cef84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 4 Aug 2016 15:11:38 +0200 Subject: [PATCH 106/144] add kdiff3 to fedora --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index b7089cd7..7ae12880 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,7 +4,7 @@ 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 dnf-automatic +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 From 6117364ec838c4f6ba3c62da0c25a87b11d51e1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 4 Aug 2016 15:36:04 +0200 Subject: [PATCH 107/144] 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?= Date: Thu, 4 Aug 2016 15:54:01 +0200 Subject: [PATCH 108/144] 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?= Date: Thu, 4 Aug 2016 15:55:10 +0200 Subject: [PATCH 109/144] 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?= Date: Thu, 4 Aug 2016 16:08:47 +0200 Subject: [PATCH 110/144] 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?= Date: Thu, 4 Aug 2016 16:08:47 +0200 Subject: [PATCH 111/144] 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?= Date: Thu, 4 Aug 2016 17:59:32 +0200 Subject: [PATCH 112/144] 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 From 1f8566dba5d7bb66d8621d9770698b6fece95ee8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 5 Aug 2016 09:56:31 +0200 Subject: [PATCH 113/144] Do not use vim under cygwin --- common/configure_fresh_system | 4 +++- windows_cygwin/build_insider.sh | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 91a862df..8fa2cf4b 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -99,7 +99,9 @@ if [[ -z $NORUST ]]; then cargo install -f rustfmt fi -echo "\n" | vim +PluginInstall +qa +if [[ -z $NOVIM ]]; then + echo "\n" | vim +PluginInstall +qa +fi cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh index af848088..ea349deb 100755 --- a/windows_cygwin/build_insider.sh +++ b/windows_cygwin/build_insider.sh @@ -8,5 +8,12 @@ git clone "$OUTER_CLONE" "$DOTFILES_PATH" cd "$DOTFILES_PATH" git remote set-url origin git@github.com:cyplo/dotfiles.git git checkout $branch -export DIR=$DOTFILES_PATH && NOSUDO=true DONT_CHANGE_SHELL=true NORUST=true $DIR/common/configure_fresh_system + +export NOSUDO=true +export DONT_CHANGE_SHELL=true +export NORUST=true +export NOVIM=true +export DIR=$DOTFILES_PATH + +$DIR/common/configure_fresh_system From c57fe3a92af5d8dd0ff48011b51356d55a7db9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 5 Aug 2016 10:04:58 +0200 Subject: [PATCH 114/144] Do not invoke YCM when no vim --- common/configure_fresh_system | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 8fa2cf4b..c79dd2d1 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -101,14 +101,13 @@ fi if [[ -z $NOVIM ]]; then echo "\n" | vim +PluginInstall +qa -fi - -cd "$DIR/.vim/bundle/YouCompleteMe/" -git submodule update --init --recursive -if [[ -z $NORUST ]]; then - ./install.py --racer-completer --clang-completer -else - ./install.py --clang-completer + cd "$DIR/.vim/bundle/YouCompleteMe/" + git submodule update --init --recursive + if [[ -z $NORUST ]]; then + ./install.py --racer-completer --clang-completer + else + ./install.py --clang-completer + fi fi if [[ -z $NO_GO ]]; then From 14851ba8bc68fd941a0709544164ec169d754d6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 5 Aug 2016 10:14:23 +0200 Subject: [PATCH 115/144] no Go under cygwin --- windows_cygwin/build_insider.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh index ea349deb..e1eff607 100755 --- a/windows_cygwin/build_insider.sh +++ b/windows_cygwin/build_insider.sh @@ -13,6 +13,7 @@ export NOSUDO=true export DONT_CHANGE_SHELL=true export NORUST=true export NOVIM=true +export NO_GO=true export DIR=$DOTFILES_PATH $DIR/common/configure_fresh_system From ec8de1dd6acfc7235ab64810e75b9f9bc5972f11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 5 Aug 2016 10:27:31 +0200 Subject: [PATCH 116/144] install python-pip manually on cygwin --- windows_cygwin/build_insider.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh index e1eff607..67e2ac84 100755 --- a/windows_cygwin/build_insider.sh +++ b/windows_cygwin/build_insider.sh @@ -16,5 +16,8 @@ export NOVIM=true export NO_GO=true export DIR=$DOTFILES_PATH +curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py +python /tmp/get-pip.py + $DIR/common/configure_fresh_system From 802da05398599d265df59c9b906da59661fc1020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 5 Aug 2016 10:56:39 +0200 Subject: [PATCH 117/144] always proper line ending for sh scripts --- .gitattributes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitattributes b/.gitattributes index 486a2325..a647db34 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,3 @@ +*.sh -crlf + *.zip filter=lfs diff=lfs merge=lfs -text From 96e2c0d09428b0fb2b45ad6f4dddc026eb4ee7f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 5 Aug 2016 13:44:57 +0200 Subject: [PATCH 118/144] add c# programming tools for windows --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index b199bca1..f7ba0fd7 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -2,7 +2,7 @@ choco install -y firefox googlechrome wget notepadplusplus sublimetext3 wget -c https://cygwin.com/setup-x86_64.exe -setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,mono,monodevelop,gtksharp,visualstudiocode,microsoft-build-tools,visualstudio2015community,p4merge,dotnet4.5 set script_path=%~dp0 set repo_path=%script_path%\..\ From 2ce24829c5448d7d89cc9c20bcb4a12502670477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 5 Aug 2016 13:46:58 +0200 Subject: [PATCH 119/144] Revert "add c# programming tools for windows" This reverts commit 218674ab69efc9158943e5d9fcfef667b0bbbe59. --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index f7ba0fd7..b199bca1 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -2,7 +2,7 @@ choco install -y firefox googlechrome wget notepadplusplus sublimetext3 wget -c https://cygwin.com/setup-x86_64.exe -setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,mono,monodevelop,gtksharp,visualstudiocode,microsoft-build-tools,visualstudio2015community,p4merge,dotnet4.5 +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang set script_path=%~dp0 set repo_path=%script_path%\..\ From 4c2b40375e148c13fbdf74472dbc949b2adb972f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 5 Aug 2016 13:48:09 +0200 Subject: [PATCH 120/144] add c# programming tools for windows --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index b199bca1..6da99688 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ @echo on -choco install -y firefox googlechrome wget notepadplusplus sublimetext3 +choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 wget -c https://cygwin.com/setup-x86_64.exe setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang From 862d41f29c9682053161c6de638a488b0a7a2ac6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 11 Aug 2016 14:37:03 +0200 Subject: [PATCH 121/144] add Ruby support via RVM --- common/configure_fresh_system | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index c79dd2d1..24b4d94d 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -99,6 +99,11 @@ if [[ -z $NORUST ]]; then cargo install -f rustfmt fi +if [[ -z $NORUBY ]]; then + gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + curl -sSL https://get.rvm.io | bash -s stable +fi + if [[ -z $NOVIM ]]; then echo "\n" | vim +PluginInstall +qa cd "$DIR/.vim/bundle/YouCompleteMe/" From 792a79443f1b88b09970837ad43aecd3c301dafe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 11 Aug 2016 14:45:48 +0200 Subject: [PATCH 122/144] install Ruby via choco on Windows instead of RVM --- .zshrc | 2 ++ windows_cygwin/build.bat | 2 +- windows_cygwin/build_insider.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.zshrc b/.zshrc index d5eba57f..860a8d40 100644 --- a/.zshrc +++ b/.zshrc @@ -51,3 +51,5 @@ alias benice="ionice -c3 nice -n20" source ~/.setenv + +export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 6da99688..6f5f5163 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ @echo on -choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 +choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby ruby2.devkit wget -c https://cygwin.com/setup-x86_64.exe setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh index 67e2ac84..7dadc6bd 100755 --- a/windows_cygwin/build_insider.sh +++ b/windows_cygwin/build_insider.sh @@ -12,6 +12,7 @@ git checkout $branch export NOSUDO=true export DONT_CHANGE_SHELL=true export NORUST=true +export NORUBY=true export NOVIM=true export NO_GO=true export DIR=$DOTFILES_PATH From 5f9eab662d23c1a8c74065b6eca0cec9581de39f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Thu, 11 Aug 2016 14:53:45 +0200 Subject: [PATCH 123/144] install Ruby in addition to just RVM --- common/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 24b4d94d..fc818a8c 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -101,7 +101,7 @@ fi if [[ -z $NORUBY ]]; then gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 - curl -sSL https://get.rvm.io | bash -s stable + curl -sSL https://get.rvm.io | bash -s stable --ruby fi if [[ -z $NOVIM ]]; then From 85f583d6872fb4634e375baf4a763cbb95e92c15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 12 Aug 2016 12:35:50 +0200 Subject: [PATCH 124/144] Add omnisharp support on Fedora --- common/configure_fresh_system | 4 ++-- fedora/configure_fresh_system | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index fc818a8c..fadb79a2 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -109,9 +109,9 @@ if [[ -z $NOVIM ]]; then cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive if [[ -z $NORUST ]]; then - ./install.py --racer-completer --clang-completer + ./install.py --system-boost --clang-completer --omnisharp-completer else - ./install.py --clang-completer + ./install.py --system-boost --racer-completer --clang-completer --omnisharp-completer fi fi diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 7ae12880..a1c087e7 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,11 +4,13 @@ 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 dnf-automatic kdiff3 +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 yum-utils FEDORA_VERSION=`rpm -E %fedora` +sudo rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" +sudo yum-config-manager --add-repo http://download.mono-project.com/repo/centos/ 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 --best --allowerasing install vlc splix gutenprint-cups cups-bjnp mono-devel keepass mplayer golang ncurses-compat-libs kicad retext sudo dnf -y groupinstall "C Development Tools and Libraries" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" From 41c922138d289335cf53c5f912dff19e9939611c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 12 Aug 2016 13:06:39 +0200 Subject: [PATCH 125/144] do not use system boost libraries to compile YCM --- common/configure_fresh_system | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index fadb79a2..7b5f90f0 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -109,9 +109,9 @@ if [[ -z $NOVIM ]]; then cd "$DIR/.vim/bundle/YouCompleteMe/" git submodule update --init --recursive if [[ -z $NORUST ]]; then - ./install.py --system-boost --clang-completer --omnisharp-completer + ./install.py --clang-completer --omnisharp-completer else - ./install.py --system-boost --racer-completer --clang-completer --omnisharp-completer + ./install.py --racer-completer --clang-completer --omnisharp-completer fi fi From 0458ee8c6dd1b884a9cbb0e99bbc290a713dbae6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 12 Aug 2016 13:44:42 +0200 Subject: [PATCH 126/144] add mono to default debian installation --- debian/configure_fresh_system | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/configure_fresh_system b/debian/configure_fresh_system index 60820f23..34dd9c19 100755 --- a/debian/configure_fresh_system +++ b/debian/configure_fresh_system @@ -19,6 +19,12 @@ if [[ -z $NO_SYSTEMCTL ]]; then sudo systemctl start tor fi +# mono +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list +echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list +sudo apt-get update +sudo apt-get install mono-devel mono-complete # install vim from sources VIM_BUILD_DIR=/tmp cd "$VIM_BUILD_DIR" From bbc78968f67004b304f5911191ac7c2b1d19e2df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 12 Aug 2016 13:58:50 +0200 Subject: [PATCH 127/144] install mono noninteractively on debian --- debian/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/configure_fresh_system b/debian/configure_fresh_system index 34dd9c19..23023f61 100755 --- a/debian/configure_fresh_system +++ b/debian/configure_fresh_system @@ -24,7 +24,7 @@ sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328 echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list sudo apt-get update -sudo apt-get install mono-devel mono-complete +sudo apt-get -y install mono-devel mono-complete # install vim from sources VIM_BUILD_DIR=/tmp cd "$VIM_BUILD_DIR" From a9496aaba5bfd006c59d07bf2a322954a6255e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Fri, 12 Aug 2016 14:51:35 +0200 Subject: [PATCH 128/144] install mono on ubuntu xenial and trusty --- ubuntu/configure_fresh_system | 5 +++++ ubuntu/trusty/configure_fresh_system | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/ubuntu/configure_fresh_system b/ubuntu/configure_fresh_system index 39f64cdd..8ab84e07 100755 --- a/ubuntu/configure_fresh_system +++ b/ubuntu/configure_fresh_system @@ -20,6 +20,11 @@ if [[ -z $NO_SYSTEMCTL ]]; then sudo systemctl start tor fi +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list +sudo apt-get update +sudo apt-get -y install mono-devel mono-complete + DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../" DIR="$DIR" $DIR/common/configure_fresh_system diff --git a/ubuntu/trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system index dd337830..886b5f9f 100755 --- a/ubuntu/trusty/configure_fresh_system +++ b/ubuntu/trusty/configure_fresh_system @@ -20,6 +20,12 @@ if [[ -z $NO_SYSTEMCTL ]]; then sudo systemctl start tor fi +sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF +echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list +echo "deb http://download.mono-project.com/repo/debian wheezy-libtiff-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list +sudo apt-get update +sudo apt-get -y install mono-devel mono-complete + DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$DIR/../../" export NO_GO=true From 0f7570dd95ec21b172eaeb3da7dba9b6ec60b6e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki-Chudyk?= Date: Sat, 13 Aug 2016 18:38:40 +0200 Subject: [PATCH 129/144] Add cucumber-vim --- .vimrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.vimrc b/.vimrc index 912ef225..4b2c7211 100755 --- a/.vimrc +++ b/.vimrc @@ -70,6 +70,7 @@ Plugin 'will133/vim-dirdiff' Plugin 'tpope/vim-dispatch.git' Plugin 'tpope/vim-fugitive.git' Plugin 'tpope/vim-sensible' +Plugin 'tpope/vim-cucumber' Plugin 'airblade/vim-gitgutter.git' Plugin 'godlygeek/tabular' Plugin 'plasticboy/vim-markdown' From 9d4f4fd39f2a8df380157a0c3bc590e9c7f69e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 20 Aug 2016 10:20:59 +0200 Subject: [PATCH 130/144] Normalize the .gitignore --- .gitconfig_includes.common | 58 +++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/.gitconfig_includes.common b/.gitconfig_includes.common index bfc7767e..5dd2b45e 100644 --- a/.gitconfig_includes.common +++ b/.gitconfig_includes.common @@ -1,29 +1,29 @@ -[user] - name = Cyryl Płotnicki-Chudyk - email = cyplo@cyplo.net -[color] - ui = true -[help] - autocorrect = 1 -[push] - default = simple -[core] - pager = cat -[alias] - tree = log --show-signature --color --decorate --date=short --all --graph -n 9 - head = log HEAD -n1 -[core] - autocrlf = false -[diff] - tool = vimdiff -[difftool] - prompt = false -[difftool "vimdiff"] - cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off' -[merge] - tool = kdiff3 -[mergetool] - keepBackup = false -[pager] - diff = diff-so-fancy | less --tabs=1,5 -RFX - show = diff-so-fancy | less --tabs=1,5 -RFX +[user] + name = Cyryl Płotnicki + email = cyplo@cyplo.net +[color] + ui = true +[help] + autocorrect = 1 +[push] + default = simple +[core] + pager = cat +[alias] + tree = log --show-signature --color --decorate --date=short --all --graph -n 8 + head = log HEAD -n1 +[core] + autocrlf = false +[diff] + tool = vimdiff +[difftool] + prompt = false +[difftool "vimdiff"] + cmd = vim -f '+next' '+execute \"DirDiff\" argv(0) argv(1)' $LOCAL $REMOTE '+syntax off' +[merge] + tool = kdiff3 +[mergetool] + keepBackup = false +[pager] + diff = diff-so-fancy | less --tabs=1,5 -RFX + show = diff-so-fancy | less --tabs=1,5 -RFX From f142a62cd505addeb3faa78fb1d249bbdfd40ad7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sat, 20 Aug 2016 10:21:24 +0200 Subject: [PATCH 131/144] Eplicit Unix line endings by default in Vim --- .vimrc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.vimrc b/.vimrc index 912ef225..037ebb11 100755 --- a/.vimrc +++ b/.vimrc @@ -78,6 +78,9 @@ Plugin 'Valloric/YouCompleteMe' call vundle#end() filetype plugin indent on +" line ending +set fileformats=unix,dos + " colours set t_Co=256 syntax enable From 4baea866eb09f15dde9711437264142051ea047c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 10:02:42 +0200 Subject: [PATCH 132/144] Upgrade oh my zsh --- .oh-my-zsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.oh-my-zsh b/.oh-my-zsh index 7fabc8bc..774c4eca 160000 --- a/.oh-my-zsh +++ b/.oh-my-zsh @@ -1 +1 @@ -Subproject commit 7fabc8bca41d4ff7090325116a85513dac852236 +Subproject commit 774c4eca6f166be554baf33ff48de9e90e98f16a From 3d3ec10f9848722c4fb667bda08511831d01b68c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 18:21:48 +0200 Subject: [PATCH 133/144] Add cygwin's mintty config --- .gitmodules | 3 --- cygwin/mintty-colors-solarized | 1 - windows_cygwin/.minttyrc | 27 +++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 4 deletions(-) delete mode 160000 cygwin/mintty-colors-solarized create mode 100644 windows_cygwin/.minttyrc diff --git a/.gitmodules b/.gitmodules index b7900e0e..08084abd 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "cygwin/mintty-colors-solarized"] - path = cygwin/mintty-colors-solarized - url = https://github.com/mavnn/mintty-colors-solarized.git [submodule ".oh-my-zsh"] path = .oh-my-zsh url = git://github.com/robbyrussell/oh-my-zsh.git diff --git a/cygwin/mintty-colors-solarized b/cygwin/mintty-colors-solarized deleted file mode 160000 index 11d7c05b..00000000 --- a/cygwin/mintty-colors-solarized +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 11d7c05bf97b6c4ae6985fa94b16f6c4e7a61b94 diff --git a/windows_cygwin/.minttyrc b/windows_cygwin/.minttyrc new file mode 100644 index 00000000..553257b0 --- /dev/null +++ b/windows_cygwin/.minttyrc @@ -0,0 +1,27 @@ +BoldAsFont=-1 +Font=DejaVu Sans Mono for Powerline +FontHeight=12 +FontWeight=700 +FontIsBold=yes +Locale=en_GB +Charset=UTF-8 +ForegroundColour=131,148,150 +BackgroundColour=0,43,54 +CursorColour=220,50,47 +Black=7,54,66 +BoldBlack=0,43,54 +Red=220,50,47 +BoldRed=203,75,22 +Green=133,153,0 +BoldGreen=88,110,117 +Yellow=181,137,0 +BoldYellow=101,123,131 +Blue=38,139,210 +BoldBlue=131,148,150 +Magenta=211,54,130 +BoldMagenta=108,113,196 +Cyan=42,161,152 +BoldCyan=147,161,161 +White=238,232,213 +BoldWhite=253,246,227 +BellType=0 From e82f80209cf5d7f1be45a91c369b1c45b0e43a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 18:22:25 +0200 Subject: [PATCH 134/144] Replace YCM with neocomplete --- .vimrc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.vimrc b/.vimrc index 8123a54d..6046b727 100755 --- a/.vimrc +++ b/.vimrc @@ -74,7 +74,7 @@ Plugin 'tpope/vim-cucumber' Plugin 'airblade/vim-gitgutter.git' Plugin 'godlygeek/tabular' Plugin 'plasticboy/vim-markdown' -Plugin 'Valloric/YouCompleteMe' +Plugin 'Shougo/neocomplete.vim' call vundle#end() filetype plugin indent on @@ -89,6 +89,17 @@ set background=dark highlight clear SignColumn colorscheme solarized +" plugins: neocomplete +let g:neocomplete#enable_at_startup = 1 +let g:neocomplete#enable_smart_case = 1 +"" : close popup and save indent. +inoremap =my_cr_function() +function! s:my_cr_function() + return (pumvisible() ? "\" : "" ) . "\" +endfunction +"" : completion. +inoremap pumvisible() ? "\" : "\" + " plugins: airline let g:bufferline_echo = 0 let g:airline_powerline_fonts = 1 From 1b1c192f9a12076985dbe2a1f04a811421624ffa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 18:22:40 +0200 Subject: [PATCH 135/144] install neocomplete under cygwin --- windows_cygwin/build.bat | 4 ++-- windows_cygwin/build_insider.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 6f5f5163..4692fb8f 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,8 +1,8 @@ @echo on -choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby ruby2.devkit +choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs wget -c https://cygwin.com/setup-x86_64.exe -setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl set script_path=%~dp0 set repo_path=%script_path%\..\ diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh index 7dadc6bd..e4954069 100755 --- a/windows_cygwin/build_insider.sh +++ b/windows_cygwin/build_insider.sh @@ -13,7 +13,6 @@ export NOSUDO=true export DONT_CHANGE_SHELL=true export NORUST=true export NORUBY=true -export NOVIM=true export NO_GO=true export DIR=$DOTFILES_PATH @@ -21,4 +20,5 @@ curl https://bootstrap.pypa.io/get-pip.py > /tmp/get-pip.py python /tmp/get-pip.py $DIR/common/configure_fresh_system +ln -vfs $DIR/windows_cygwin/.minttyrc $HOME/ From 0e1c6016872cfe1aa86c8adb3725f1ac2c5261b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 18:39:05 +0200 Subject: [PATCH 136/144] Explicitly install all packages on windows via choco --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 4692fb8f..33a8ac94 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ @echo on -choco install -y firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs +choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs wget -c https://cygwin.com/setup-x86_64.exe setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl From ca99b0aa21e8c27cb51693fe0c247f1b9995b3e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 21 Aug 2016 18:39:19 +0200 Subject: [PATCH 137/144] remove YCM --- common/configure_fresh_system | 7 ------- 1 file changed, 7 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 7b5f90f0..9b13c143 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -106,13 +106,6 @@ fi if [[ -z $NOVIM ]]; then echo "\n" | vim +PluginInstall +qa - cd "$DIR/.vim/bundle/YouCompleteMe/" - git submodule update --init --recursive - if [[ -z $NORUST ]]; then - ./install.py --clang-completer --omnisharp-completer - else - ./install.py --racer-completer --clang-completer --omnisharp-completer - fi fi if [[ -z $NO_GO ]]; then From 9dc044b64d954356de17be53b9cb18934f667913 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Tue, 23 Aug 2016 11:09:17 +0200 Subject: [PATCH 138/144] Add stylecop on windows --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 33a8ac94..4a86043d 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,5 @@ @echo on -choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs +choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs stylecop wget -c https://cygwin.com/setup-x86_64.exe setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl From 64bb00767257c41a40cc677a54e97485002811ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 24 Aug 2016 19:09:55 +0200 Subject: [PATCH 139/144] Use Mono from the repos on Fedora --- fedora/configure_fresh_system | 2 -- 1 file changed, 2 deletions(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index a1c087e7..05a403e6 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -6,8 +6,6 @@ set -e 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 dnf-automatic kdiff3 yum-utils FEDORA_VERSION=`rpm -E %fedora` -sudo rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF" -sudo yum-config-manager --add-repo http://download.mono-project.com/repo/centos/ 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 mono-devel keepass mplayer golang ncurses-compat-libs kicad retext From a28321ec6315304d30622d8c6144611ff4085334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Wed, 24 Aug 2016 19:46:40 +0200 Subject: [PATCH 140/144] Install npm explicitly on Fedora --- fedora/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora/configure_fresh_system b/fedora/configure_fresh_system index 05a403e6..0bebb38e 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -4,7 +4,7 @@ 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 dnf-automatic kdiff3 yum-utils +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 git xz util-linux-user powertop dnf-automatic kdiff3 yum-utils 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 From ae9d220cce015131c6aa821bc07765ff8b117eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 25 Aug 2016 15:37:05 +0200 Subject: [PATCH 141/144] Add `ag` to cygwin --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 4a86043d..dc39105e 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -2,7 +2,7 @@ choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs stylecop wget -c https://cygwin.com/setup-x86_64.exe -setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl +setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl,the_silver_searcher set script_path=%~dp0 set repo_path=%script_path%\..\ From e728bf0d1b911f50f44182daa6aa134be5c36297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 25 Aug 2016 16:06:48 +0200 Subject: [PATCH 142/144] Explicit npm installation on Windows --- windows_cygwin/build.bat | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index 4a86043d..f5e11daa 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,5 +1,6 @@ @echo on -choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs stylecop +choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs.install stylecop +refreshenv wget -c https://cygwin.com/setup-x86_64.exe setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl From 34df8548d3f26736f2ed973782588409ba4bb22d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Thu, 25 Aug 2016 16:21:31 +0200 Subject: [PATCH 143/144] Do not exit whole build after refreshenv --- windows_cygwin/build.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows_cygwin/build.bat b/windows_cygwin/build.bat index f5e11daa..cbb587a3 100755 --- a/windows_cygwin/build.bat +++ b/windows_cygwin/build.bat @@ -1,6 +1,6 @@ @echo on choco install -y --allowEmptyChecksum firefox googlechrome wget notepadplusplus sublimetext3 mono monodevelop gtksharp visualstudiocode microsoft-build-tools visualstudio2015community p4merge dotnet4.5 ruby nodejs.install stylecop -refreshenv +call refreshenv wget -c https://cygwin.com/setup-x86_64.exe setup-x86_64.exe -R "C:\cygwin64" -s http://cygwin.netbet.org/ -q -g -P curl,zsh,git,vim,wget,xz,tar,gawk,bzip2,subversion,zlib,fontconfig,clang,cmake,lua,perl From c30c13d48828748105c49aa84b2c38161523e76f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 26 Aug 2016 09:09:19 +0200 Subject: [PATCH 144/144] Link in correct gitconfig under cygwin --- windows_cygwin/build_insider.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/windows_cygwin/build_insider.sh b/windows_cygwin/build_insider.sh index e4954069..f1c25446 100755 --- a/windows_cygwin/build_insider.sh +++ b/windows_cygwin/build_insider.sh @@ -21,4 +21,5 @@ python /tmp/get-pip.py $DIR/common/configure_fresh_system ln -vfs $DIR/windows_cygwin/.minttyrc $HOME/ +ln -vfs $DIR/.gitconfig.cygwin $HOME/.gitconfig