diff --git a/.travis.yml b/.travis.yml index 5dc1e9ae..82c8aa76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,12 @@ -language: bash +language: + - bash -script: ./bunsen/test_outsider +script: + - ./test + +env: + - DETECTED_OS=fedora + - DETECTED_OS=bunsen sudo: required 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 560059f9..fed9f69b 100755 --- a/fedora/configure_fresh_system +++ b/fedora/configure_fresh_system @@ -1,16 +1,20 @@ #!/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 +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 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/../" 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 diff --git a/test b/test new file mode 100755 index 00000000..24ad174e --- /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/test_outsider +