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

change debug

Browse source
This commit is contained in:
Jakobus Schürz 2021-03-06 20:24:28 +01:00
parent e1cd657747
commit 971805c8a3
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/git-myshellconfig-checkout
View file

@ -65,9 +65,7 @@ while [ $# -gt 0 ]; do
esac esac
done done
# If MSC_GIT_TAG is set, checkout is always headless. # If MSC_GIT_TAG is set, checkout is always headless.
logwarn "git PRE: ${PRE}"
[ -z "${MSC_GIT_TAG:+x}" ] || { export MSC_GIT_BRANCH=${MSC_GIT_TAG}; export PRE=""; echo "DEBUG"; } [ -z "${MSC_GIT_TAG:+x}" ] || { export MSC_GIT_BRANCH=${MSC_GIT_TAG}; export PRE=""; echo "DEBUG"; }
logwarn "git PRE: ${PRE}"
# Output # Output
#echo -n " remote: ${MSC_GIT_REMOTE_NAME}, branch: ${MSC_GIT_BRANCH}: " #echo -n " remote: ${MSC_GIT_REMOTE_NAME}, branch: ${MSC_GIT_BRANCH}: "

18
myshell_load_defaults
View file

@ -81,18 +81,18 @@ if ! $SSHS; then
#cd ${HOME} #cd ${HOME}
# Start tmux if not defined as STARTTMUX in bashrc # Start tmux if not defined as STARTTMUX in bashrc
logwarn -n "attach tmux?" logdebug "attach tmux?"
logwarn "TMUX: $TMUX" logdebug "TMUX: $TMUX"
logwarn "SSH_TTY: $SSH_TTY" logdebug "SSH_TTY: $SSH_TTY"
logwarn "TERM: $TERM" logdebug "TERM: $TERM"
logwarn "tmux@${USER}: $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? )" logdebug "tmux@${USER}: $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? )"
if test $SSH_TTY; then if test $SSH_TTY; then
logwarn "i am remote" loginfo "i am remote"
if test ! $TMUX && test $TERM != screen; then if test ! $TMUX && test $TERM != screen; then
logwarn "no screen" loginfo "no screen"
# if test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then # if test $(systemctl status tmux@${USER}.service 1>/dev/null 2>&1; echo $? ) -eq 0; then
if tmux has-session -t User || tmux has-session -t "${USER}"; then if tmux has-session -t User || tmux has-session -t "${USER}"; then
logwarn "tmux@${USER} is running" loginfo "tmux@${USER} is running"
STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT} STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
fi fi
fi fi
@ -105,7 +105,7 @@ if ! $SSHS; then
# logwarn "TEST2" # logwarn "TEST2"
# STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT} # STARTTMUXDEFAULT=${STARTTMUXREMOTEDEFAULT}
# fi # fi
logwarn "${STARTTMUXDEFAULT}" logdebug "${STARTTMUXDEFAULT}"
unset -f pathmunge unset -f pathmunge