diff options
| author | makefu <github@syntax-fehler.de> | 2013-06-17 16:31:27 +0200 |
|---|---|---|
| committer | makefu <github@syntax-fehler.de> | 2013-06-17 16:31:27 +0200 |
| commit | 89c2bc71c4c7704ff713794fe0d3f3b0ba819dc1 (patch) | |
| tree | e20025d5b9ff4319c4ce9f58c940043d500b2774 | |
| parent | 83baf76c734a5c9471fd9ab4dd90c952aba4e6a0 (diff) | |
| parent | 1e8592ab9ee5b9e8c5963a0bbed7cecb225e79ca (diff) | |
Merge branch 'master' of github.com:krebscode/painload
| -rwxr-xr-x | infest/profiles/makefu/vim/vimrc | 1 | ||||
| -rw-r--r-- | retiolum/hosts/darth-serious (renamed from retiolum/hosts/darth_serious) | 0 | ||||
| -rwxr-xr-x | retiolum/scripts/tinc_setup/new_install.sh | 4 |
3 files changed, 3 insertions, 2 deletions
diff --git a/infest/profiles/makefu/vim/vimrc b/infest/profiles/makefu/vim/vimrc index 69ff3f58..123e15a5 100755 --- a/infest/profiles/makefu/vim/vimrc +++ b/infest/profiles/makefu/vim/vimrc @@ -11,6 +11,7 @@ Bundle 'gmarik/vundle' Bundle 'SudoEdit.vim' Bundle 'snipMate' Bundle 'tpope/vim-fugitive' +Bundle 'vim-scripts-iptables' Bundle 'pyflakes' filetype plugin indent on diff --git a/retiolum/hosts/darth_serious b/retiolum/hosts/darth-serious index bcabc5f5..bcabc5f5 100644 --- a/retiolum/hosts/darth_serious +++ b/retiolum/hosts/darth-serious diff --git a/retiolum/scripts/tinc_setup/new_install.sh b/retiolum/scripts/tinc_setup/new_install.sh index 57d59e25..76ed9e70 100755 --- a/retiolum/scripts/tinc_setup/new_install.sh +++ b/retiolum/scripts/tinc_setup/new_install.sh @@ -121,7 +121,7 @@ find_os() } find_telnet(){ - if exists elnet >/dev/null;then + if exists telnet >/dev/null;then TELNET="`command -v telnet`" elif exists busybox >/dev/null;then TELNET="`command -v busybox` telnet" @@ -168,7 +168,7 @@ if ! exists curl ; then fi else LOADER=curl - HEAD_LOADER=$LOADER -I + HEAD_LOADER="$LOADER -I" fi if ! $HEAD_LOADER $SURL >/dev/null 2>/dev/null ;then |