Merge branch 'master' into merge_tools_windows

This commit is contained in:
Cyryl Płotnicki-Chudyk 2016-07-12 19:05:40 +02:00 committed by GitHub
commit 4963f64b99
30 changed files with 93 additions and 427 deletions

3
.gitignore vendored
View file

@ -1,3 +1,4 @@
.vim/undo/ .vim/undo/
.vim/.netrwhist .vim/.netrwhist
.vim/bundle/*
!.vim/bundle/Vundle.vim

58
.gitmodules vendored
View file

@ -1,70 +1,18 @@
[submodule ".vim/bundle/vim-fugitive"]
path = .vim/bundle/vim-fugitive
url = http://github.com/tpope/vim-fugitive
[submodule ".vim/bundle/vim-markdown"]
path = .vim/bundle/vim-markdown
url = https://github.com/plasticboy/vim-markdown.git
[submodule ".vim/bundle/vim-powerline"]
path = .vim/bundle/vim-powerline
url = https://github.com/Lokaltog/vim-powerline.git
[submodule ".vim/bundle/vim-syntastic"]
path = .vim/bundle/vim-syntastic
url = https://github.com/scrooloose/syntastic
[submodule "cygwin/mintty-colors-solarized"] [submodule "cygwin/mintty-colors-solarized"]
path = cygwin/mintty-colors-solarized path = cygwin/mintty-colors-solarized
url = https://github.com/mavnn/mintty-colors-solarized.git url = https://github.com/mavnn/mintty-colors-solarized.git
[submodule ".vim/bundle/salt-vim"]
path = .vim/bundle/salt-vim
url = https://github.com/saltstack/salt-vim.git
[submodule ".vim/bundle/vim-airline"]
path = .vim/bundle/vim-airline
url = https://github.com/bling/vim-airline
[submodule ".vim/bundle/vim-gitgutter"]
path = .vim/bundle/vim-gitgutter
url = https://github.com/airblade/vim-gitgutter
[submodule ".vim/bundle/vim-colors-solarized"]
path = .vim/bundle/vim-colors-solarized
url = https://github.com/cyplo/vim-colors-solarized.git
[submodule ".oh-my-zsh"] [submodule ".oh-my-zsh"]
path = .oh-my-zsh path = .oh-my-zsh
url = git://github.com/robbyrussell/oh-my-zsh.git url = git://github.com/robbyrussell/oh-my-zsh.git
[submodule ".vim/bundle/nerdtree"]
path = .vim/bundle/nerdtree
url = https://github.com/scrooloose/nerdtree
[submodule ".vim/bundle/vim-ctrlp"]
path = .vim/bundle/vim-ctrlp
url = https://github.com/kien/ctrlp.vim.git
[submodule "tools/icdiff.git"] [submodule "tools/icdiff.git"]
path = tools/icdiff.git path = tools/icdiff.git
url = https://github.com/jeffkaufman/icdiff.git url = https://github.com/jeffkaufman/icdiff.git
[submodule ".vim/bundle/splice"]
path = .vim/bundle/splice
url = https://github.com/sjl/splice.vim.git
[submodule ".vim/bundle/vim-dirdiff"]
path = .vim/bundle/vim-dirdiff
url = git://github.com/will133/vim-dirdiff
[submodule "tools/subuser"] [submodule "tools/subuser"]
path = tools/subuser path = tools/subuser
url = https://github.com/subuser-security/subuser url = https://github.com/subuser-security/subuser
[submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"] [submodule ".oh-my-zsh-plugins/zsh-syntax-highlighting"]
path = .oh-my-zsh-plugins/zsh-syntax-highlighting path = .oh-my-zsh-plugins/zsh-syntax-highlighting
url = git://github.com/zsh-users/zsh-syntax-highlighting.git url = git://github.com/zsh-users/zsh-syntax-highlighting.git
[submodule ".vim/bundle/rust.vim"] [submodule ".vim/bundle/Vundle.vim"]
path = .vim/bundle/rust.vim path = .vim/bundle/Vundle.vim
url = https://github.com/rust-lang/rust.vim.git url = https://github.com/VundleVim/Vundle.vim.git
[submodule ".vim/bundle/racer"]
path = .vim/bundle/racer
url = https://github.com/phildawes/racer.git
[submodule ".vim/bundle/YouCompleteMe"]
path = .vim/bundle/YouCompleteMe
url = https://github.com/Valloric/YouCompleteMe.git
[submodule ".vim/bundle/ack.vim"]
path = .vim/bundle/ack.vim
url = https://github.com/mileszs/ack.vim.git
[submodule ".vim/bundle/vim-cargo"]
path = .vim/bundle/vim-cargo
url = https://github.com/timonv/vim-cargo.git
[submodule ".vim/bundle/vim-dispatch"]
path = .vim/bundle/vim-dispatch
url = https://github.com/tpope/vim-dispatch.git

View file

@ -7,6 +7,7 @@ script:
env: env:
- DETECTED_OS=fedora - DETECTED_OS=fedora
- DETECTED_OS=bunsen - DETECTED_OS=bunsen
- DETECTED_OS=ubuntu
sudo: required sudo: required

View file

@ -1,326 +0,0 @@
" pathogen.vim - path option manipulation
" Maintainer: Tim Pope <http://tpo.pe/>
" Version: 2.2
" Install in ~/.vim/autoload (or ~\vimfiles\autoload).
"
" For management of individually installed plugins in ~/.vim/bundle (or
" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your
" .vimrc is the only other setup necessary.
"
" The API is documented inline below. For maximum ease of reading,
" :set foldmethod=marker
if exists("g:loaded_pathogen") || &cp
finish
endif
let g:loaded_pathogen = 1
function! s:warn(msg)
echohl WarningMsg
echomsg a:msg
echohl NONE
endfunction
" Point of entry for basic default usage. Give a relative path to invoke
" pathogen#incubate() (defaults to "bundle/{}"), or an absolute path to invoke
" pathogen#surround(). For backwards compatibility purposes, a full path that
" does not end in {} or * is given to pathogen#runtime_prepend_subdirectories()
" instead.
function! pathogen#infect(...) abort " {{{1
for path in a:0 ? reverse(copy(a:000)) : ['bundle/{}']
if path =~# '^[^\\/]\+$'
call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
call pathogen#incubate(path . '/{}')
elseif path =~# '^[^\\/]\+[\\/]\%({}\|\*\)$'
call pathogen#incubate(path)
elseif path =~# '[\\/]\%({}\|\*\)$'
call pathogen#surround(path)
else
call s:warn('Change pathogen#infect('.string(path).') to pathogen#infect('.string(path.'/{}').')')
call pathogen#surround(path . '/{}')
endif
endfor
call pathogen#cycle_filetype()
return ''
endfunction " }}}1
" Split a path into a list.
function! pathogen#split(path) abort " {{{1
if type(a:path) == type([]) | return a:path | endif
let split = split(a:path,'\\\@<!\%(\\\\\)*\zs,')
return map(split,'substitute(v:val,''\\\([\\,]\)'',''\1'',"g")')
endfunction " }}}1
" Convert a list to a path.
function! pathogen#join(...) abort " {{{1
if type(a:1) == type(1) && a:1
let i = 1
let space = ' '
else
let i = 0
let space = ''
endif
let path = ""
while i < a:0
if type(a:000[i]) == type([])
let list = a:000[i]
let j = 0
while j < len(list)
let escaped = substitute(list[j],'[,'.space.']\|\\[\,'.space.']\@=','\\&','g')
let path .= ',' . escaped
let j += 1
endwhile
else
let path .= "," . a:000[i]
endif
let i += 1
endwhile
return substitute(path,'^,','','')
endfunction " }}}1
" Convert a list to a path with escaped spaces for 'path', 'tag', etc.
function! pathogen#legacyjoin(...) abort " {{{1
return call('pathogen#join',[1] + a:000)
endfunction " }}}1
" Remove duplicates from a list.
function! pathogen#uniq(list) abort " {{{1
let i = 0
let seen = {}
while i < len(a:list)
if (a:list[i] ==# '' && exists('empty')) || has_key(seen,a:list[i])
call remove(a:list,i)
elseif a:list[i] ==# ''
let i += 1
let empty = 1
else
let seen[a:list[i]] = 1
let i += 1
endif
endwhile
return a:list
endfunction " }}}1
" \ on Windows unless shellslash is set, / everywhere else.
function! pathogen#separator() abort " {{{1
return !exists("+shellslash") || &shellslash ? '/' : '\'
endfunction " }}}1
" Convenience wrapper around glob() which returns a list.
function! pathogen#glob(pattern) abort " {{{1
let files = split(glob(a:pattern),"\n")
return map(files,'substitute(v:val,"[".pathogen#separator()."/]$","","")')
endfunction "}}}1
" Like pathogen#glob(), only limit the results to directories.
function! pathogen#glob_directories(pattern) abort " {{{1
return filter(pathogen#glob(a:pattern),'isdirectory(v:val)')
endfunction "}}}1
" Turn filetype detection off and back on again if it was already enabled.
function! pathogen#cycle_filetype() " {{{1
if exists('g:did_load_filetypes')
filetype off
filetype on
endif
endfunction " }}}1
" Check if a bundle is disabled. A bundle is considered disabled if it ends
" in a tilde or its basename or full name is included in the list
" g:pathogen_disabled.
function! pathogen#is_disabled(path) " {{{1
if a:path =~# '\~$'
return 1
elseif !exists("g:pathogen_disabled")
return 0
endif
let sep = pathogen#separator()
let blacklist = g:pathogen_disabled
return index(blacklist, strpart(a:path, strridx(a:path, sep)+1)) != -1 && index(blacklist, a:path) != 1
endfunction "}}}1
" Prepend the given directory to the runtime path and append its corresponding
" after directory. If the directory is already included, move it to the
" outermost position. Wildcards are added as is. Ending a path in /{} causes
" all subdirectories to be added (except those in g:pathogen_disabled).
function! pathogen#surround(path) abort " {{{1
let sep = pathogen#separator()
let rtp = pathogen#split(&rtp)
if a:path =~# '[\\/]{}$'
let path = fnamemodify(a:path[0:-4], ':p:s?[\\/]\=$??')
let before = filter(pathogen#glob_directories(path.sep.'*'), '!pathogen#is_disabled(v:val)')
let after = filter(reverse(pathogen#glob_directories(path.sep."*".sep."after")), '!pathogen#is_disabled(v:val[0:-7])')
call filter(rtp,'v:val[0:strlen(path)-1] !=# path')
else
let path = fnamemodify(a:path, ':p:s?[\\/]\=$??')
let before = [path]
let after = [path . sep . 'after']
call filter(rtp, 'index(before + after, v:val) == -1')
endif
let &rtp = pathogen#join(before, rtp, after)
return &rtp
endfunction " }}}1
" Prepend all subdirectories of path to the rtp, and append all 'after'
" directories in those subdirectories. Deprecated.
function! pathogen#runtime_prepend_subdirectories(path) " {{{1
call s:warn('Change pathogen#runtime_prepend_subdirectories('.string(a:path).') to pathogen#surround('.string(a:path.'/{}').')')
return pathogen#surround(a:path . pathogen#separator() . '{}')
endfunction " }}}1
" For each directory in the runtime path, add a second entry with the given
" argument appended. If the argument ends in '/{}', add a separate entry for
" each subdirectory. The default argument is 'bundle/{}', which means that
" .vim/bundle/*, $VIM/vimfiles/bundle/*, $VIMRUNTIME/bundle/*,
" $VIM/vim/files/bundle/*/after, and .vim/bundle/*/after will be added (on
" UNIX).
function! pathogen#incubate(...) abort " {{{1
let sep = pathogen#separator()
let name = a:0 ? a:1 : 'bundle/{}'
if "\n".s:done_bundles =~# "\\M\n".name."\n"
return ""
endif
let s:done_bundles .= name . "\n"
let list = []
for dir in pathogen#split(&rtp)
if dir =~# '\<after$'
if name =~# '{}$'
let list += filter(pathogen#glob_directories(substitute(dir,'after$',name[0:-3],'').'*'.sep.'after'), '!pathogen#is_disabled(v:val[0:-7])') + [dir]
else
let list += [dir, substitute(dir, 'after$', '', '') . name . sep . 'after']
endif
else
if name =~# '{}$'
let list += [dir] + filter(pathogen#glob_directories(dir.sep.name[0:-3].'*'), '!pathogen#is_disabled(v:val)')
else
let list += [dir . sep . name, dir]
endif
endif
endfor
let &rtp = pathogen#join(pathogen#uniq(list))
return 1
endfunction " }}}1
" Deprecated alias for pathogen#incubate().
function! pathogen#runtime_append_all_bundles(...) abort " {{{1
if a:0
call s:warn('Change pathogen#runtime_append_all_bundles('.string(a:1).') to pathogen#incubate('.string(a:1.'/{}').')')
else
call s:warn('Change pathogen#runtime_append_all_bundles() to pathogen#incubate()')
endif
return call('pathogen#incubate', map(copy(a:000),'v:val . "/{}"'))
endfunction
let s:done_bundles = ''
" }}}1
" Invoke :helptags on all non-$VIM doc directories in runtimepath.
function! pathogen#helptags() abort " {{{1
let sep = pathogen#separator()
for glob in pathogen#split(&rtp)
for dir in split(glob(glob), "\n")
if (dir.sep)[0 : strlen($VIMRUNTIME)] !=# $VIMRUNTIME.sep && filewritable(dir.sep.'doc') == 2 && !empty(filter(split(glob(dir.sep.'doc'.sep.'*'),"\n>"),'!isdirectory(v:val)')) && (!filereadable(dir.sep.'doc'.sep.'tags') || filewritable(dir.sep.'doc'.sep.'tags'))
silent! execute 'helptags' pathogen#fnameescape(dir.'/doc')
endif
endfor
endfor
endfunction " }}}1
command! -bar Helptags :call pathogen#helptags()
" Execute the given command. This is basically a backdoor for --remote-expr.
function! pathogen#execute(...) abort " {{{1
for command in a:000
execute command
endfor
return ''
endfunction " }}}1
" Like findfile(), but hardcoded to use the runtimepath.
function! pathogen#runtime_findfile(file,count) abort "{{{1
let rtp = pathogen#join(1,pathogen#split(&rtp))
let file = findfile(a:file,rtp,a:count)
if file ==# ''
return ''
else
return fnamemodify(file,':p')
endif
endfunction " }}}1
" Backport of fnameescape().
function! pathogen#fnameescape(string) abort " {{{1
if exists('*fnameescape')
return fnameescape(a:string)
elseif a:string ==# '-'
return '\-'
else
return substitute(escape(a:string," \t\n*?[{`$\\%#'\"|!<"),'^[+>]','\\&','')
endif
endfunction " }}}1
if exists(':Vedit')
finish
endif
let s:vopen_warning = 0
function! s:find(count,cmd,file,lcd) " {{{1
let rtp = pathogen#join(1,pathogen#split(&runtimepath))
let file = pathogen#runtime_findfile(a:file,a:count)
if file ==# ''
return "echoerr 'E345: Can''t find file \"".a:file."\" in runtimepath'"
endif
if !s:vopen_warning
let s:vopen_warning = 1
let warning = '|echohl WarningMsg|echo "Install scriptease.vim to continue using :V'.a:cmd.'"|echohl NONE'
else
let warning = ''
endif
if a:lcd
let path = file[0:-strlen(a:file)-2]
execute 'lcd `=path`'
return a:cmd.' '.pathogen#fnameescape(a:file) . warning
else
return a:cmd.' '.pathogen#fnameescape(file) . warning
endif
endfunction " }}}1
function! s:Findcomplete(A,L,P) " {{{1
let sep = pathogen#separator()
let cheats = {
\'a': 'autoload',
\'d': 'doc',
\'f': 'ftplugin',
\'i': 'indent',
\'p': 'plugin',
\'s': 'syntax'}
if a:A =~# '^\w[\\/]' && has_key(cheats,a:A[0])
let request = cheats[a:A[0]].a:A[1:-1]
else
let request = a:A
endif
let pattern = substitute(request,'/\|\'.sep,'*'.sep,'g').'*'
let found = {}
for path in pathogen#split(&runtimepath)
let path = expand(path, ':p')
let matches = split(glob(path.sep.pattern),"\n")
call map(matches,'isdirectory(v:val) ? v:val.sep : v:val')
call map(matches,'expand(v:val, ":p")[strlen(path)+1:-1]')
for match in matches
let found[match] = 1
endfor
endfor
return sort(keys(found))
endfunction " }}}1
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Ve :execute s:find(<count>,'edit<bang>',<q-args>,0)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vedit :execute s:find(<count>,'edit<bang>',<q-args>,0)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vopen :execute s:find(<count>,'edit<bang>',<q-args>,1)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vsplit :execute s:find(<count>,'split',<q-args>,<bang>1)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vvsplit :execute s:find(<count>,'vsplit',<q-args>,<bang>1)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vtabedit :execute s:find(<count>,'tabedit',<q-args>,<bang>1)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vpedit :execute s:find(<count>,'pedit',<q-args>,<bang>1)
command! -bar -bang -range=1 -nargs=1 -complete=customlist,s:Findcomplete Vread :execute s:find(<count>,'read',<q-args>,<bang>1)
" vim:set et sw=2:

@ -0,0 +1 @@
Subproject commit 4984767509e3d05ca051e253c8a8b37de784be45

@ -1 +0,0 @@
Subproject commit 94ec3ed902e4e55b1766232d3b0e7d602bc2c472

@ -1 +0,0 @@
Subproject commit 0a7d28bfb130696f73d122cac99d8903e066c896

@ -1 +0,0 @@
Subproject commit f8fd2ecce20f5005e6313ce57d6d2a209890c946

@ -1 +0,0 @@
Subproject commit 063094b977ce6c415f91e939626f334982c0a0a3

@ -1 +0,0 @@
Subproject commit 115d321d383eb96d438466c56cc871fcc1bd0faa

@ -1 +0,0 @@
Subproject commit bdfd0a558898df77aa8fc4c7b142062fdee3b2f7

@ -1 +0,0 @@
Subproject commit 4d322d823563f6fd2d72c129b1e99f5a98060fa8

@ -1 +0,0 @@
Subproject commit 246c217562dfd8541ee0d64600a628daa4195dd2

@ -1 +0,0 @@
Subproject commit fbf907c353eaafdf4a270f66c1bb6aad767d874f

@ -1 +0,0 @@
Subproject commit b1f234b8aa879a8276fc2c73c99ec68d7635de96

@ -1 +0,0 @@
Subproject commit b5d3fe66a58a13d2ff8b6391f4387608496a030f

@ -1 +0,0 @@
Subproject commit 779185c33cccada094f59aa1345ffe19d2e581e4

@ -1 +0,0 @@
Subproject commit 5f5c22c9ed48ee64fc5f02ac3acd543b97732fe8

@ -1 +0,0 @@
Subproject commit 0374322ba5d85ae44dd9dc44ef31ca015a59097e

@ -1 +0,0 @@
Subproject commit 39f011909620e0c7ae555efdace20c3963ac88af

@ -1 +0,0 @@
Subproject commit 74c9c60796ef10284ba26aaf38ffb39beae5f62c

@ -1 +0,0 @@
Subproject commit 64cce208388c10debd5b150de08d9be371bd0e86

34
.vimrc
View file

@ -20,6 +20,9 @@ nmap <leader>t :wa <bar> :Make test<CR>
" navigate buffers by ctrl-b " navigate buffers by ctrl-b
nmap <C-b> :bprevious<CR> nmap <C-b> :bprevious<CR>
" YCM
nnoremap <Leader>g :YcmCompleter GoTo<CR>
nnoremap ; : nnoremap ; :
" no cheating ! " no cheating !
@ -45,10 +48,37 @@ set shiftwidth=4
set expandtab set expandtab
" plugins " plugins
execute pathogen#infect()
filetype off
set rtp+=~/.vim/bundle/Vundle.vim
call vundle#begin()
Plugin 'VundleVim/Vundle.vim'
Plugin 'https://github.com/cyplo/vim-colors-solarized.git'
Plugin 'mileszs/ack.vim'
Plugin 'scrooloose/nerdtree.git'
Plugin 'scrooloose/syntastic.git'
Plugin 'wting/rust.vim'
Plugin 'sjl/splice.vim.git'
Plugin 'vim-airline/vim-airline'
Plugin 'vim-airline/vim-airline-themes'
Plugin 'timonv/vim-cargo'
Plugin 'kien/ctrlp.vim'
Plugin 'will133/vim-dirdiff'
Plugin 'tpope/vim-dispatch.git'
Plugin 'tpope/vim-fugitive.git'
Plugin 'tpope/vim-sensible'
Plugin 'airblade/vim-gitgutter.git'
Plugin 'godlygeek/tabular'
Plugin 'plasticboy/vim-markdown'
Plugin 'Valloric/YouCompleteMe'
call vundle#end()
filetype plugin indent on filetype plugin indent on
" colours [need pathogen] " colours
set t_Co=256 set t_Co=256
syntax enable syntax enable
set background=dark set background=dark

2
.zshrc
View file

@ -45,6 +45,8 @@ else
alias tscp="torsocks scp" alias tscp="torsocks scp"
fi fi
alias benice="ionice -c3 nice -n20"
# env vars # env vars
source ~/.setenv source ~/.setenv

View file

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
set -v
sudo apt-get update sudo apt-get update
sudo apt-get -y upgrade sudo apt-get -y upgrade
@ -20,10 +19,6 @@ if [[ -z $DONT_START_TOR ]]; then
sudo systemctl start tor sudo systemctl start tor
fi fi
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$DIR/../"
DIR="$DIR" $DIR/common/configure_fresh_system
# install vim from sources # install vim from sources
VIM_BUILD_DIR=/tmp VIM_BUILD_DIR=/tmp
cd "$VIM_BUILD_DIR" cd "$VIM_BUILD_DIR"
@ -42,3 +37,8 @@ sudo make install
cd cd
rm -fvr "$VIM_BUILD_DIR/vim" rm -fvr "$VIM_BUILD_DIR/vim"
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$DIR/../"
DIR="$DIR" $DIR/common/configure_fresh_system

View file

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
set -e set -e
set -v
echo echo
echo "configuring settings common among OSes" echo "configuring settings common among OSes"
sudo true sudo true
@ -44,10 +43,6 @@ ln -vfs "$DIR/.config/redshift.conf" ~/.config/redshift.conf
source ~/.setenv source ~/.setenv
cd "$DIR/.vim/bundle/YouCompleteMe/"
git submodule update --init --recursive
python install.py --clang-completer
# symlink 'nodejs' as node on some systems # symlink 'nodejs' as node on some systems
# will replace symlink if it exists, but won't replace regular file # will replace symlink if it exists, but won't replace regular file
if [[ ! -f /usr/bin/node ]]; then if [[ ! -f /usr/bin/node ]]; then
@ -83,18 +78,20 @@ export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
cd "$DIR/../" cd "$DIR/../"
echo "getting rust sources..." echo "getting rust sources..."
if [[ ! -d rust ]]; then if [[ ! -d rust ]]; then
git clone https://github.com/rust-lang/rust.git git clone https://github.com/rust-lang/rust.git --recursive
else else
cd rust cd rust
git pull git pull
git submodule update --init --recursive
fi fi
set +e cargo install -f rustfmt
cargo uninstall rustfmt
cargo uninstall racer echo "\n" | vim +PluginInstall +qa
set -e
cargo install rustfmt cd "$DIR/.vim/bundle/YouCompleteMe/"
cargo install racer git submodule update --init --recursive
./install.py --racer-completer --clang-completer
# go # go
export GOPATH="$HOME/go" export GOPATH="$HOME/go"

View file

@ -8,7 +8,7 @@ sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderb
FEDORA_VERSION=`rpm -E %fedora` 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/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 sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang ncurses-compat-libs
sudo dnf -y groupinstall "C Development Tools and Libraries" sudo dnf -y groupinstall "C Development Tools and Libraries"
if [[ -z $DONT_START_TOR ]]; then if [[ -z $DONT_START_TOR ]]; then

View file

@ -1,18 +1,25 @@
#!/bin/bash #!/bin/bash
# detect if building inside a CI system, like Travis
echo "choosing the more interactive installation method"
COMMAND_PREFIX="apt-get -y";
set -e set -e
set -v
sudo apt-get update 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"
UPGRADE_COMMAND="sudo $COMMAND_PREFIX dist-upgrade" set +e
eval ${UPGRADE_COMMAND} for i in `seq 1 3`; do
eval $install_packages
done
INSTALL_COMMAND="sudo $COMMAND_PREFIX install meld whois zsh tmux vim atop aria2 curl pv pixz gajim tor torsocks nodejs npm terminator gsmartcontrol python-pip mesa-utils mesa-utils-extra aptitude p7zip-full p7zip-rar thunderbird mercurial kdiff3 gnupg2 python3-setuptools aircrack-ng macchanger realpath python3-dev python3 python3-pip apt-file" set -e
eval ${INSTALL_COMMAND} eval $install_packages
if [[ -z $DONT_START_TOR ]]; then
sudo systemctl enable tor
sudo systemctl start tor
fi
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

19
ubuntu/test_insider Executable file
View file

@ -0,0 +1,19 @@
#!/bin/bash
set -e
export DEBIAN_FRONTEND=noninteractive
export DONT_CHANGE_SHELL=true
export DONT_START_TOR=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/configure_fresh_system

3
ubuntu/test_outsider Executable file
View file

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