Merge branch 'master' of git.schuerz.at:public/myshellconfig
This commit is contained in:
commit
234a7b02af
3 changed files with 10 additions and 4 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -55,3 +55,6 @@
|
||||||
[submodule "vim/pack/color/start/vim-colors-solarized"]
|
[submodule "vim/pack/color/start/vim-colors-solarized"]
|
||||||
path = vim/pack/color/start/vim-colors-solarized
|
path = vim/pack/color/start/vim-colors-solarized
|
||||||
url = https://github.com/altercation/vim-colors-solarized.git
|
url = https://github.com/altercation/vim-colors-solarized.git
|
||||||
|
[submodule "vim/pack/plugins/start/vim-gnupg"]
|
||||||
|
path = vim/pack/plugins/start/vim-gnupg
|
||||||
|
url = https://github.com/jamessan/vim-gnupg
|
||||||
|
|
10
functions.sh
10
functions.sh
|
@ -353,13 +353,15 @@ sshs() {
|
||||||
local TMPBASHCONFIG=$(mktemp -p ${XDG_RUNTIME_DIR} -t bashrc.XXXXXXXX --suffix=.conf)
|
local TMPBASHCONFIG=$(mktemp -p ${XDG_RUNTIME_DIR} -t bashrc.XXXXXXXX --suffix=.conf)
|
||||||
local FILELIST=( "${MSC_BASE}/functions.sh" "${MSC_BASE}/logging" "${MSC_BASE}/myshell_load_fortmpconfig" $(getbashrcfile) ~/.aliases "${MSC_BASE}/aliases" "${MSC_BASE}/PS1" "${MSC_BASE}/bash_completion.d/*" )
|
local FILELIST=( "${MSC_BASE}/functions.sh" "${MSC_BASE}/logging" "${MSC_BASE}/myshell_load_fortmpconfig" $(getbashrcfile) ~/.aliases "${MSC_BASE}/aliases" "${MSC_BASE}/PS1" "${MSC_BASE}/bash_completion.d/*" )
|
||||||
|
|
||||||
|
echo "FILELIST: $FILELIST"
|
||||||
if [ -e "${HOME}/.config/myshellconfig/sshs_addfiles.conf" ] ; then
|
if [ -e "${HOME}/.config/myshellconfig/sshs_addfiles.conf" ] ; then
|
||||||
for file in $(cat "${HOME}/.config/myshellconfig/sshs_addfiles.conf");do
|
for f in $(cat "${HOME}/.config/myshellconfig/sshs_addfiles.conf");do
|
||||||
[ -e "$file" ] && {\
|
[ -e "$f" ] && {\
|
||||||
echo "add $file to FILELIST"; \
|
echo "add $f to FILELIST"; \
|
||||||
FILELIST+=("$i"); }
|
FILELIST+=("$f"); }
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
echo "FILELIST: $FILELIST"
|
||||||
local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%r@%h:%p"
|
local SSH_OPTS="-o VisualHostKey=no -o ControlMaster=auto -o ControlPersist=15s -o ControlPath=~/.ssh/ssh-%r@%h:%p"
|
||||||
# Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first
|
# Read /etc/bashrc or /etc/bash.bashrc (depending on distribution) and /etc/profile.d/*.sh first
|
||||||
cat << EOF >> "${TMPBASHCONFIG}"
|
cat << EOF >> "${TMPBASHCONFIG}"
|
||||||
|
|
|
@ -16,3 +16,4 @@ install plugins https://github.com/junegunn/fzf.git
|
||||||
install plugins https://github.com/junegunn/fzf.vim.git
|
install plugins https://github.com/junegunn/fzf.vim.git
|
||||||
install plugins https://github.com/airblade/vim-gitgutter.git
|
install plugins https://github.com/airblade/vim-gitgutter.git
|
||||||
remove plugins https://github.com/Lokaltog/powerline.git
|
remove plugins https://github.com/Lokaltog/powerline.git
|
||||||
|
install plugins https://github.com/jamessan/vim-gnupg
|
||||||
|
|
Loading…
Reference in a new issue