Merge branch 'master' of git.schuerz.at:public/myshellconfig

This commit is contained in:
Jakobus Schürz 2020-12-19 13:02:24 +01:00
commit 234a7b02af
3 changed files with 10 additions and 4 deletions

3
.gitmodules vendored
View file

@ -55,3 +55,6 @@
[submodule "vim/pack/color/start/vim-colors-solarized"]
path = vim/pack/color/start/vim-colors-solarized
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

View file

@ -353,13 +353,15 @@ sshs() {
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/*" )
echo "FILELIST: $FILELIST"
if [ -e "${HOME}/.config/myshellconfig/sshs_addfiles.conf" ] ; then
for file in $(cat "${HOME}/.config/myshellconfig/sshs_addfiles.conf");do
[ -e "$file" ] && {\
echo "add $file to FILELIST"; \
FILELIST+=("$i"); }
for f in $(cat "${HOME}/.config/myshellconfig/sshs_addfiles.conf");do
[ -e "$f" ] && {\
echo "add $f to FILELIST"; \
FILELIST+=("$f"); }
done
fi
echo "FILELIST: $FILELIST"
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
cat << EOF >> "${TMPBASHCONFIG}"

View file

@ -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/airblade/vim-gitgutter.git
remove plugins https://github.com/Lokaltog/powerline.git
install plugins https://github.com/jamessan/vim-gnupg