jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of /run/media/jakobus.schuerz/gitstick/myshellconfig

Browse source
This commit is contained in:
Jakobus Schürz 2020-07-09 22:01:43 +02:00
commit ce78567b5a
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
functions.sh
View file

@ -271,7 +271,7 @@ sshs() {
local f local f
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=( $(getbashrcfile) ~/.aliases "${MYSHELLCONFIG_BASE}/functions.sh" "${MYSHELLCONFIG_BASE}/aliases" "${MYSHELLCONFIG_BASE}/PS1" "${MYSHELLCONFIG_BASE}/bash_completion.d/*" "${MYSHELLCONFIG_BASE}/myshell_load_fortmpconfig" ) local FILELIST=( "${MYSHELLCONFIG_BASE}/myshell_load_fortmpconfig" $(getbashrcfile) ~/.aliases "${MYSHELLCONFIG_BASE}/functions.sh" "${MYSHELLCONFIG_BASE}/aliases" "${MYSHELLCONFIG_BASE}/PS1" "${MYSHELLCONFIG_BASE}/bash_completion.d/*" )
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
@ -280,6 +280,10 @@ sshs() {
[ -e /etc/bash.bashrc ] && BASHRC=/etc/bash.bashrc [ -e /etc/bash.bashrc ] && BASHRC=/etc/bash.bashrc
. \$BASHRC . \$BASHRC
export USERNAME="${USERNAME}"
export FULLNAME="${FULLNAME}"
export USEREMAIL="${USEREMAIL}"
for i in /etc/profile.d/*.sh; do for i in /etc/profile.d/*.sh; do
if [ -r "$i" ];then if [ -r "$i" ];then
if [ "$PS1" ]; then if [ "$PS1" ]; then
@ -455,10 +459,10 @@ function tmuxx() {
echo no session specified return echo no session specified return
;; ;;
esac esac
TMUX='/usr/bin/tmux' TMUX_BIN='/usr/bin/tmux'
$TMUX -f ~/.tmux.conf new-session -d $TMUX_BIN -f ~/.tmux.conf new-session -d
[ -e ${SESS[0]} ] && $TMUX source-file ${SESS[0]} [ -e ${SESS[0]} ] && $TMUX_BIN source-file ${SESS[0]}
$TMUX attach-session -d $TMUX_BIN attach-session -d
} }