From a7f14557096722463fd3d6ec0a5df7c763a9195e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 16 Oct 2016 17:35:28 +0200 Subject: [PATCH 1/7] Install Nikola by default --- common/configure_fresh_system | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 69724e9e..46801e23 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -144,9 +144,11 @@ fi $SUDO npm install -g reveal-md $SUDO npm install -g diff-so-fancy -# vdir syncer -echo "installing vdirsyncer" -$SUDO pip install vdirsyncer +if [[ -z $NOPYTHON3 ]]; then + $SUDO pip3 install Nikola --upgrade +else + $SUDO pip install Nikola --upgrade +fi if [[ -z $USER ]]; then USER=`whoami` From b50482975683eab5bce26903f6324eef3cbb9c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 16 Oct 2016 17:38:26 +0200 Subject: [PATCH 2/7] Add Nikola auto dependencies --- 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 46801e23..4ee76ba0 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -145,9 +145,9 @@ $SUDO npm install -g reveal-md $SUDO npm install -g diff-so-fancy if [[ -z $NOPYTHON3 ]]; then - $SUDO pip3 install Nikola --upgrade + $SUDO pip3 install ws4py watchdog webassets Nikola --upgrade else - $SUDO pip install Nikola --upgrade + $SUDO pip install ws4py watchdog webassets Nikola --upgrade fi if [[ -z $USER ]]; then From 5533f777f39d83c86c6b4ba3546af61218e18241 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 16 Oct 2016 17:53:28 +0200 Subject: [PATCH 3/7] Refactor pip installs to reduce duplication --- common/configure_fresh_system | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/configure_fresh_system b/common/configure_fresh_system index 4ee76ba0..6ab58448 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -145,11 +145,13 @@ $SUDO npm install -g reveal-md $SUDO npm install -g diff-so-fancy if [[ -z $NOPYTHON3 ]]; then - $SUDO pip3 install ws4py watchdog webassets Nikola --upgrade + PIP=pip3 else - $SUDO pip install ws4py watchdog webassets Nikola --upgrade + PIP=pip fi +$SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola --upgrade + if [[ -z $USER ]]; then USER=`whoami` fi From 1b521e810c0aa4449ac079c687b31da5050e3092 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 16 Oct 2016 19:10:28 +0200 Subject: [PATCH 4/7] Fix Nikola compilation error on Debian and Ubuntu --- debian/configure_fresh_system | 2 +- ubuntu/trusty/configure_fresh_system | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/configure_fresh_system b/debian/configure_fresh_system index 7666ac2a..d19a4660 100755 --- a/debian/configure_fresh_system +++ b/debian/configure_fresh_system @@ -8,7 +8,7 @@ if [[ -z $NOUPGRADE ]]; then sudo apt-get -y upgrade fi -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" +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 libxml2-dev libxslt1-dev" set +e for i in `seq 1 3`; do diff --git a/ubuntu/trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system index 3052b049..f83054ab 100755 --- a/ubuntu/trusty/configure_fresh_system +++ b/ubuntu/trusty/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 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 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 terminator thunderbird thunderbird-enigmail tmux tor torsocks whois zsh libxml2-dev libxslt1-dev" set +e for i in `seq 1 3`; do From 17082e3dd847be820ccce8b41a980bc497cc8cf0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 16 Oct 2016 19:11:47 +0200 Subject: [PATCH 5/7] Fix Nikola compilation error 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 916b6eb8..f8c34349 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -6,7 +6,7 @@ if [[ -z $NOUPGRADE ]]; then sudo dnf -y upgrade --best --allowerasing fi -sudo dnf -y --best --allowerasing install 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 nodejs npm terminator gsmartcontrol python-pip mercurial python3-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 util-linux-user ncurses-devel zeal qt5-linguist qtkeychain-qt5-devel archivemount keepass splix gutenprint-cups cups-bjnp golang +sudo dnf -y --best --allowerasing install 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 nodejs npm terminator gsmartcontrol python-pip mercurial python3-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 util-linux-user ncurses-devel zeal qt5-linguist qtkeychain-qt5-devel archivemount keepass splix gutenprint-cups cups-bjnp golang redhat-rpm-config sudo dnf -y groupinstall "C Development Tools and Libraries" sudo dnf -y groupinstall "Development Tools" From 79db743bbca0b509700dfa0f0f19f10b2a5e5208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 16 Oct 2016 21:21:12 +0200 Subject: [PATCH 6/7] Do not upgrade Nikola dependencies --- 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 6ab58448..d215708f 100755 --- a/common/configure_fresh_system +++ b/common/configure_fresh_system @@ -150,7 +150,7 @@ else PIP=pip fi -$SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola --upgrade +$SUDO $PIP install pygments-style-solarized ws4py watchdog webassets Nikola if [[ -z $USER ]]; then USER=`whoami` From 7a100278114c25d986a8876b2b26fdfa6408aea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Sun, 16 Oct 2016 22:00:43 +0200 Subject: [PATCH 7/7] Fix Nikola compilation on Trusty --- ubuntu/trusty/configure_fresh_system | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/trusty/configure_fresh_system b/ubuntu/trusty/configure_fresh_system index f83054ab..1ab0e477 100755 --- a/ubuntu/trusty/configure_fresh_system +++ b/ubuntu/trusty/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 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 whois zsh libxml2-dev libxslt1-dev" +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 whois zsh libxml2-dev libxslt1-dev libtiff5-dev libjpeg8-dev zlib1g-dev libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python-tk" set +e for i in `seq 1 3`; do