Merge pull request #22 from cyplo/support_win10ubuntu

Support Ubuntu on Windows
This commit is contained in:
Cyryl Płotnicki 2016-08-05 07:33:00 +02:00 committed by GitHub
commit 10d6ae8152
12 changed files with 80 additions and 21 deletions

View file

@ -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

View file

@ -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

View file

@ -1,3 +0,0 @@
#!/bin/bash
docker run -v `pwd`:/root/temp/dotfiles/ debian:jessie /root/temp/dotfiles/bunsen/test_insider

View file

@ -93,12 +93,13 @@ cd "$DIR/.vim/bundle/YouCompleteMe/"
git submodule update --init --recursive
./install.py --racer-completer --clang-completer
# go
if [[ -z $NO_GO ]]; then
export GOPATH="$HOME/go"
mkdir -p "$GOPATH"
# excercism
go get -u github.com/exercism/cli/exercism
fi
# talks: reveal-md
sudo npm install -g reveal-md

View file

@ -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

View file

@ -1,3 +0,0 @@
#!/bin/bash
docker run -v `pwd`:/root/temp/dotfiles/ fedora:24 /root/temp/dotfiles/fedora/test_insider

22
test
View file

@ -5,5 +5,25 @@ if [[ -z $DETECTED_OS ]]; then
exit 1
fi
./$DETECTED_OS/test_outsider
if [[ $DETECTED_OS =~ .*:.* ]]; then
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
fi
INSIDER_ROOT_DIR=/root/temp/dotfiles/
CURRENT_DIR=`pwd`
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

View file

@ -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 vim"
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

View file

@ -1,3 +0,0 @@
#!/bin/bash
docker run -v `pwd`:/root/temp/dotfiles/ ubuntu:xenial /root/temp/dotfiles/ubuntu/test_insider

View file

@ -0,0 +1,26 @@
#!/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/../../"
export NO_GO=true
DIR="$DIR" $DIR/common/configure_fresh_system

19
ubuntu/trusty/test_insider Executable file
View file

@ -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