Merge remote-tracking branch 'origin/master' into vscode

2016-09-21 09:26:50 +02:00 · 2016-09-21 09:26:50 +02:00 · 77e6c14b1b
commit 77e6c14b1b
parent 551b928d37 363930d529
9 changed files with 69 additions and 39 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,8 +5,8 @@ script:
    - ./test 

 env:
-    - DETECTED_OS=fedora:rawhide NOUPGRADE=true
-    - DETECTED_OS=debian:jessie NOUPGRADE=true
+    - DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base
+    - DETECTED_OS=debian:jessie DOCKER_IMAGE=cyplo/jessie_base
    - DETECTED_OS=ubuntu:trusty
    - DETECTED_OS=ubuntu:xenial

--- a/debian/configure_fresh_system
+++ b/debian/configure_fresh_system
@ -29,26 +29,26 @@ echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /
 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
-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"
+
+if [[ -z $NO_COMPILE_VIM ]]; then
+    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-python3interp=yes \
+                --enable-luainterp \
+                --enable-gui=no \
+                --enable-cscope 
+    make -j2
+    sudo make install
+    cd
+    rm -fvr "$VIM_BUILD_DIR/vim"
+fi

 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../"
 DIR="$DIR" $DIR/common/configure_fresh_system

-
--- a/debian/test_insider
+++ b/debian/test_insider
@ -5,6 +5,7 @@ set -e
 export DEBIAN_FRONTEND=noninteractive
 export DONT_CHANGE_SHELL=true
 export NO_SYSTEMCTL=true
+export NO_COMPILE_VIM=true

 echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries

--- a/fedora/Dockerfile
+++ b/fedora/Dockerfile
@ -0,0 +1,20 @@
+FROM fedora:24
+
+RUN dnf -y install sudo
+RUN sudo dnf -y upgrade --best --allowerasing
+RUN 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
+
+RUN sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-24.noarch.rpm
+RUN sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-24.noarch.rpm
+RUN sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp mono-devel keepass mplayer golang ncurses-compat-libs kicad retext
+RUN sudo dnf -y groupinstall "C Development Tools and Libraries"
+RUN sudo dnf -y groupinstall "Development Tools"
+
+RUN git clone https://github.com/vim/vim.git /tmp/vim
+RUN cd /tmp/vim && ./configure --with-features=huge \
+            --enable-multibyte \
+            --enable-rubyinterp \
+            --enable-python3interp=yes \
+            --enable-luainterp \
+            --enable-gui=no \
+            --enable-cscope && make -j2 && sudo make install
--- a/fedora/configure_fresh_system
+++ b/fedora/configure_fresh_system
@ -2,11 +2,10 @@

 set -e

-#software and shell
 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 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
+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 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
 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
@ -27,21 +26,23 @@ if [[ -z $NO_SYSTEMCTL ]]; then
    sudo systemctl list-timers "*dnf-*"
 fi

-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-python3interp=yes \
-            --enable-luainterp \
-            --enable-gui=no \
-            --enable-cscope 
-make -j2
-sudo make install
-cd
-rm -fvr "$VIM_BUILD_DIR/vim"
+if [[ -z $NO_COMPILE_VIM ]]; then
+    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-python3interp=yes \
+                --enable-luainterp \
+                --enable-gui=no \
+                --enable-cscope 
+    make -j2
+    sudo make install
+    cd
+    rm -fvr "$VIM_BUILD_DIR/vim"
+fi

 DIR="$DIR/../"
 DIR="$DIR" $DIR/common/configure_fresh_system
--- a/fedora/test_insider
+++ b/fedora/test_insider
@ -4,6 +4,7 @@ set -e

 export DONT_CHANGE_SHELL=true
 export NO_SYSTEMCTL=true
+export NO_COMPILE_VIM=true

 dnf -y install sudo

--- a/6
+++ b/6
@ -25,5 +25,9 @@ else
    DIR=$SYSTEM_DIR
 fi

-docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DETECTED_OS $INSIDER_ROOT_DIR/$DIR/test_insider
+if [[ -z $DOCKER_IMAGE ]]; then
+    DOCKER_IMAGE="$DETECTED_OS"
+fi
+
+docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DOCKER_IMAGE $INSIDER_ROOT_DIR/$DIR/test_insider

--- a/tools/genpasswd
+++ b/tools/genpasswd
@ -1,4 +1,4 @@
 #!/bin/bash
 l=$1
-[ "$l" == "" ] && l=16
+[ "$l" == "" ] && l=32
 tr -dc A-Za-z0-9_ < /dev/urandom | head -c ${l} | xargs
--- a/tools/showdns
+++ b/tools/showdns
@ -0,0 +1,3 @@
+#!/bin//sh
+nmcli device show | grep DNS | cut -d']' -f2 | tr -d ' ' | cut -c2-
+