Merge branch 'master' into cucumber
This commit is contained in:
commit
3a69f86cd0
5 changed files with 23 additions and 4 deletions
|
@ -109,9 +109,9 @@ if [[ -z $NOVIM ]]; then
|
||||||
cd "$DIR/.vim/bundle/YouCompleteMe/"
|
cd "$DIR/.vim/bundle/YouCompleteMe/"
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
if [[ -z $NORUST ]]; then
|
if [[ -z $NORUST ]]; then
|
||||||
./install.py --racer-completer --clang-completer
|
./install.py --clang-completer --omnisharp-completer
|
||||||
else
|
else
|
||||||
./install.py --clang-completer
|
./install.py --racer-completer --clang-completer --omnisharp-completer
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
6
debian/configure_fresh_system
vendored
6
debian/configure_fresh_system
vendored
|
@ -19,6 +19,12 @@ if [[ -z $NO_SYSTEMCTL ]]; then
|
||||||
sudo systemctl start tor
|
sudo systemctl start tor
|
||||||
fi
|
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 -y install mono-devel mono-complete
|
||||||
# install vim from sources
|
# install vim from sources
|
||||||
VIM_BUILD_DIR=/tmp
|
VIM_BUILD_DIR=/tmp
|
||||||
cd "$VIM_BUILD_DIR"
|
cd "$VIM_BUILD_DIR"
|
||||||
|
|
|
@ -4,11 +4,13 @@ set -e
|
||||||
|
|
||||||
#software and shell
|
#software and shell
|
||||||
sudo dnf -y upgrade --best --allowerasing
|
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`
|
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/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm
|
||||||
sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm
|
sudo dnf -y install 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"
|
sudo dnf -y groupinstall "C Development Tools and Libraries"
|
||||||
|
|
||||||
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
|
|
|
@ -20,6 +20,11 @@ if [[ -z $NO_SYSTEMCTL ]]; then
|
||||||
sudo systemctl start tor
|
sudo systemctl start tor
|
||||||
fi
|
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="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
DIR="$DIR/../"
|
DIR="$DIR/../"
|
||||||
DIR="$DIR" $DIR/common/configure_fresh_system
|
DIR="$DIR" $DIR/common/configure_fresh_system
|
||||||
|
|
|
@ -20,6 +20,12 @@ if [[ -z $NO_SYSTEMCTL ]]; then
|
||||||
sudo systemctl start tor
|
sudo systemctl start tor
|
||||||
fi
|
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="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
|
||||||
DIR="$DIR/../../"
|
DIR="$DIR/../../"
|
||||||
export NO_GO=true
|
export NO_GO=true
|
||||||
|
|
Loading…
Reference in a new issue