From fac7133f6dcc2aeb7083ad2971c1e7836b4a2453 Mon Sep 17 00:00:00 2001 From: makefu Date: Tue, 18 Feb 2014 23:01:21 +0100 Subject: fix py2 py3 issue in supernodes script --- retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py b/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py index 7bb79708..7e1f4dae 100755 --- a/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py +++ b/retiolum/scripts/adv_graphgen/tinc_stats/Supernodes.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/python3 def find_potential_super(path="/etc/tinc/retiolum/hosts"): import os @@ -56,4 +56,4 @@ if __name__ == "__main__": usage """ for host,addrs in check_all_the_super(): - print(host,addrs) + print("%s %s" %(host,str(addrs))) -- cgit v1.2.3 From c3b00da20b5b6fc1147052b1dff55c4f5f9e67e6 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 14:24:47 +0100 Subject: add visit page module for reaktor --- .gitmodules | 3 +++ Reaktor/commands/visit-page | 1 + 2 files changed, 4 insertions(+) create mode 120000 Reaktor/commands/visit-page diff --git a/.gitmodules b/.gitmodules index 336b225d..f7bdf95f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -40,3 +40,6 @@ [submodule "sites/mediengewitter.krebsco.de/mediengewitter/mediengewitter"] path = sites/mediengewitter.krebsco.de/mediengewitter/mediengewitter url = https://github.com/makefu/mediengewitter.git +[submodule "https:/github.com/makefu/view-website.git"] + path = https:/github.com/makefu/view-website.git + url = ./Reaktor/repos/view-website diff --git a/Reaktor/commands/visit-page b/Reaktor/commands/visit-page new file mode 120000 index 00000000..be95ca4c --- /dev/null +++ b/Reaktor/commands/visit-page @@ -0,0 +1 @@ +../repos/visit-website/runner.sh \ No newline at end of file -- cgit v1.2.3 From fb75532f8ac05761955ea25ed0d00ce66a6567db Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 14:25:40 +0100 Subject: update env-bootstrapping --- ship/lib/vim | 1 + ship/src/bootstrap_env_makefu | 27 +++++++++++++++++++++++---- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/ship/lib/vim b/ship/lib/vim index 43173585..f75f3d0e 100644 --- a/ship/lib/vim +++ b/ship/lib/vim @@ -22,6 +22,7 @@ inoremap nnoremap vnoremap set wildignore=*.o,*.obj,*.bak,*.exe,*.os +cmap w!! w !sudo tee > /dev/null % colorscheme darkblue set background=dark set number diff --git a/ship/src/bootstrap_env_makefu b/ship/src/bootstrap_env_makefu index 44148665..6c75cd57 100755 --- a/ship/src/bootstrap_env_makefu +++ b/ship/src/bootstrap_env_makefu @@ -5,12 +5,23 @@ #@include core #@include punani #@include vim + +# vim +python +_punanidb_pacman_vim_python=gvim +_punanidb_yum_vim_python=vim-enhanced +_punanidb_aptget_vim_python=vim + +# TODO pull out youcompleteme into a vim function +# cmake ,make,g++,python-dev for youcompleteme +_punanidb_pacman_cmake=cmake +_punanidb_yum_cmake=cmake +_punanidb_aptget_cmake=cmake #@mainifyme info "Configuring environment for $(id -un)" cd $(readlink -f $(dirname $0)) info "Using punani to install git vim and zsh" -punani install git vim zsh || error "cannot install some shit" +punani install git vim_python zsh gpp cmake make python2_dev || die "cannot install some shit" info "writing dotfiles" # deploying zshrc @@ -100,19 +111,27 @@ set spelllang=en set textwidth=9001 autocmd BufRead *.json set filetype=json EOF - +if [ -e $HOME/.vimrc ] ; then + oldvim=$HOME/.vimrc.`date +%Y%M%d` + info "Backing up old vimrc file to $oldvim" + mv -v $HOME/.vimrc $oldvim +fi +info "Symlinking .vimrc to .vim/vimrc" ln -vs $HOME/.vim/vimrc $HOME/.vimrc vim_conf_sane_defaults #install all the vim stuff with the help of vundle cd $HOME/.vim -mkdir bundle -mkdir backup +mkdir -p bundle info "Fetching vim-vundle" git clone https://github.com/gmarik/vundle.git bundle/vundle > /dev/null && \ info "Vim Vundle deployed" info "Installing Vundle Bundles" vim "+:BundleInstall" "+:qall" + +info "building youcompleteme libs" +cd $HOME/.vim/bundle/YouCompleteMe +./install.sh cd - info "configuring zsh" -- cgit v1.2.3 From c6b10ba46ea17f4ff0bc2f666dc1237fbb643b9d Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 14:26:52 +0100 Subject: whatweb is now up-to-date --- Reaktor/repos/whatweb | 2 +- ship/lib/_punani_db | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Reaktor/repos/whatweb b/Reaktor/repos/whatweb index 0918a0d9..f35d0265 160000 --- a/Reaktor/repos/whatweb +++ b/Reaktor/repos/whatweb @@ -1 +1 @@ -Subproject commit 0918a0d9b75df77f9c3e9eb360b6b22824582a20 +Subproject commit f35d0265c04605dbddec5ea9af418ebd796eef60 diff --git a/ship/lib/_punani_db b/ship/lib/_punani_db index 609baf07..e5bf15b1 100644 --- a/ship/lib/_punani_db +++ b/ship/lib/_punani_db @@ -54,3 +54,4 @@ _punanidb_aptget_nano=nano _punanidb_pacman_vim=vim _punanidb_yum_vim=vim-enhanced _punanidb_aptget_vim=vim + -- cgit v1.2.3 From d0f5222e22acc61790d4ea0c4f155d5573a633b2 Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 14:34:34 +0100 Subject: fix broken submodule --- .gitmodules | 6 +++--- Reaktor/repos/view-website | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 160000 Reaktor/repos/view-website diff --git a/.gitmodules b/.gitmodules index f7bdf95f..23652084 100644 --- a/.gitmodules +++ b/.gitmodules @@ -25,6 +25,9 @@ [submodule "Reaktor/repos/whatweb"] path = Reaktor/repos/whatweb url = https://github.com/urbanadventurer/WhatWeb.git +[submodule "Reaktor/repos/view-website"] + path = Reaktor/repos/view-website + url = https://github.com/makefu/view-website.git [submodule "minikrebs"] path = Cancer/minikrebs url = https://github.com/krebscode/minikrebs.git @@ -40,6 +43,3 @@ [submodule "sites/mediengewitter.krebsco.de/mediengewitter/mediengewitter"] path = sites/mediengewitter.krebsco.de/mediengewitter/mediengewitter url = https://github.com/makefu/mediengewitter.git -[submodule "https:/github.com/makefu/view-website.git"] - path = https:/github.com/makefu/view-website.git - url = ./Reaktor/repos/view-website diff --git a/Reaktor/repos/view-website b/Reaktor/repos/view-website new file mode 160000 index 00000000..5b9a22cf --- /dev/null +++ b/Reaktor/repos/view-website @@ -0,0 +1 @@ +Subproject commit 5b9a22cf872a9855b7cb5eddd7bf962dfbff50df -- cgit v1.2.3 From c48ee1d169a77902442639f6bc48d0a7b291eafb Mon Sep 17 00:00:00 2001 From: makefu Date: Fri, 7 Mar 2014 14:42:16 +0100 Subject: Reaktur: fix symlink to visit-page script --- Reaktor/commands/visit-page | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Reaktor/commands/visit-page b/Reaktor/commands/visit-page index be95ca4c..8723336b 120000 --- a/Reaktor/commands/visit-page +++ b/Reaktor/commands/visit-page @@ -1 +1 @@ -../repos/visit-website/runner.sh \ No newline at end of file +../repos/view-website/runner.sh \ No newline at end of file -- cgit v1.2.3