better handling of login scripts
- include .bashrc into the distributed files - .bash_profile calls .bashrc (for login shells) - .config/linse.bash instead of .config/linse-profile
This commit is contained in:
l_samenv
@@ -1,26 +1,2 @@
|
||||
# helper for adding to PATH without duplicates
|
||||
pathadd() {
|
||||
if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then
|
||||
PATH="${PATH:+"$PATH:"}$1"
|
||||
fi
|
||||
}
|
||||
|
||||
pathadd ~/bin
|
||||
pathadd ~/.local/bin
|
||||
pathadd ~/frappy/bin
|
||||
|
||||
frappy() {
|
||||
if [[ -z "$1" ]]; then
|
||||
echo "Usage: frappy status|start|stop|restart|cli"
|
||||
elif [[ "$1" == "cli" ]]; then
|
||||
~/boxtools/start_frappy cli
|
||||
else
|
||||
systemctl --user $1 frappy
|
||||
fi
|
||||
}
|
||||
|
||||
boxweb() {
|
||||
sudo systemctl $1 boxweb
|
||||
}
|
||||
|
||||
. ~/.config/linse_profile
|
||||
. ~/.bashrc
|
||||
# see also .config/linse.bash, which is called by .bashrc
|
||||
|
||||
121
to_home/.bashrc
Normal file
121
to_home/.bashrc
Normal file
@@ -0,0 +1,121 @@
|
||||
# ~/.bashrc: executed by bash(1) for non-login shells.
|
||||
# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
|
||||
# for examples
|
||||
|
||||
# If not running interactively, don't do anything
|
||||
case $- in
|
||||
*i*) ;;
|
||||
*) return;;
|
||||
esac
|
||||
|
||||
# ==========================================
|
||||
# SEE ALSO ~/.config/linse.bash CALLED BELOW
|
||||
# ==========================================
|
||||
|
||||
# don't put duplicate lines or lines starting with space in the history.
|
||||
# See bash(1) for more options
|
||||
HISTCONTROL=ignoreboth
|
||||
|
||||
# append to the history file, don't overwrite it
|
||||
shopt -s histappend
|
||||
|
||||
# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
|
||||
HISTSIZE=1000
|
||||
HISTFILESIZE=2000
|
||||
|
||||
# check the window size after each command and, if necessary,
|
||||
# update the values of LINES and COLUMNS.
|
||||
shopt -s checkwinsize
|
||||
|
||||
# If set, the pattern "**" used in a pathname expansion context will
|
||||
# match all files and zero or more directories and subdirectories.
|
||||
#shopt -s globstar
|
||||
|
||||
# make less more friendly for non-text input files, see lesspipe(1)
|
||||
#[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
|
||||
|
||||
# set variable identifying the chroot you work in (used in the prompt below)
|
||||
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
|
||||
debian_chroot=$(cat /etc/debian_chroot)
|
||||
fi
|
||||
|
||||
# set a fancy prompt (non-color, unless we know we "want" color)
|
||||
case "$TERM" in
|
||||
xterm-color|*-256color) color_prompt=yes;;
|
||||
esac
|
||||
|
||||
# uncomment for a colored prompt, if the terminal has the capability; turned
|
||||
# off by default to not distract the user: the focus in a terminal window
|
||||
# should be on the output of commands, not on the prompt
|
||||
#force_color_prompt=yes
|
||||
|
||||
if [ -n "$force_color_prompt" ]; then
|
||||
if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
|
||||
# We have color support; assume it's compliant with Ecma-48
|
||||
# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
|
||||
# a case would tend to support setf rather than setaf.)
|
||||
color_prompt=yes
|
||||
else
|
||||
color_prompt=
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$color_prompt" = yes ]; then
|
||||
PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w \$\[\033[00m\] '
|
||||
else
|
||||
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
|
||||
fi
|
||||
unset color_prompt force_color_prompt
|
||||
|
||||
# If this is an xterm set the title to user@host:dir
|
||||
case "$TERM" in
|
||||
xterm*|rxvt*)
|
||||
PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
|
||||
# enable color support of ls and also add handy aliases
|
||||
if [ -x /usr/bin/dircolors ]; then
|
||||
test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
|
||||
alias ls='ls --color=auto'
|
||||
#alias dir='dir --color=auto'
|
||||
#alias vdir='vdir --color=auto'
|
||||
|
||||
alias grep='grep --color=auto'
|
||||
alias fgrep='fgrep --color=auto'
|
||||
alias egrep='egrep --color=auto'
|
||||
fi
|
||||
|
||||
# colored GCC warnings and errors
|
||||
#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
|
||||
|
||||
# some more ls aliases
|
||||
#alias ll='ls -l'
|
||||
#alias la='ls -A'
|
||||
#alias l='ls -CF'
|
||||
|
||||
# Alias definitions.
|
||||
# You may want to put all your additions into a separate file like
|
||||
# ~/.bash_aliases, instead of adding them here directly.
|
||||
# See /usr/share/doc/bash-doc/examples in the bash-doc package.
|
||||
|
||||
if [ -f ~/.bash_aliases ]; then
|
||||
. ~/.bash_aliases
|
||||
fi
|
||||
|
||||
if [ -f ~/.config/linse.bash ]; then
|
||||
. ~/.config/linse.bash
|
||||
fi
|
||||
|
||||
# enable programmable completion features (you don't need to enable
|
||||
# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
|
||||
# sources /etc/bash.bashrc).
|
||||
if ! shopt -oq posix; then
|
||||
if [ -f /usr/share/bash-completion/bash_completion ]; then
|
||||
. /usr/share/bash-completion/bash_completion
|
||||
elif [ -f /etc/bash_completion ]; then
|
||||
. /etc/bash_completion
|
||||
fi
|
||||
fi
|
||||
52
to_home/.config/linse.bash
Normal file
52
to_home/.config/linse.bash
Normal file
@@ -0,0 +1,52 @@
|
||||
# common script for interactive login and non-login shells
|
||||
# helper for adding to PATH without duplicates
|
||||
|
||||
pathadd() {
|
||||
if [ -d "$1" ] && [[ ":$PATH:" != *":$1:"* ]]; then
|
||||
PATH="${PATH:+"$PATH:"}$1"
|
||||
fi
|
||||
}
|
||||
|
||||
pathadd ~/bin
|
||||
pathadd ~/.local/bin
|
||||
pathadd ~/frappy/bin
|
||||
|
||||
frappy() {
|
||||
if [[ -z "$1" ]]; then
|
||||
echo "Usage: frappy status|start|stop|restart|cli"
|
||||
elif [[ "$1" == "cli" ]]; then
|
||||
~/boxtools/start_frappy cli
|
||||
else
|
||||
systemctl --user $1 frappy
|
||||
fi
|
||||
}
|
||||
|
||||
boxweb() {
|
||||
sudo systemctl $1 boxweb
|
||||
}
|
||||
|
||||
gitea_git() (
|
||||
for repo in "$@"; do
|
||||
cd ~/$repo
|
||||
scp -q -r -o BatchMode=yes -o StrictHostKeyChecking=no l_samenv@linse-c:gitea/hooks .git/
|
||||
grep -q 'https://gitea.psi.ch' .git/config || git remote set-url origin https://gitea.psi.ch/linse/${repo}.git
|
||||
grep -q "$PWD/.git/hooks/get_gitea_token" .git/config || git config credential.helper "$PWD/.git/hooks/get_gitea_token"
|
||||
done
|
||||
)
|
||||
|
||||
# now the aliases
|
||||
alias dir='ls -alF'
|
||||
alias pico='nano -Ynone'
|
||||
export EDITOR=pico
|
||||
|
||||
|
||||
if [[ "$(tty)" == "/dev/tty1" && -z "$(pgrep wayfire)" ]]; then
|
||||
echo "desktop is not running, try to start it"
|
||||
python ~/boxtools/wait_websocket.py
|
||||
if [[ -z "$(pgrep wayfire)" ]]; then
|
||||
echo "start desktop (wayfire)"
|
||||
wayfire
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
@@ -1,13 +0,0 @@
|
||||
alias dir='ls -alF'
|
||||
export EDITOR=nano
|
||||
|
||||
. ~/.config/linse_setuser
|
||||
|
||||
function gitea_git() (
|
||||
for repo in "$@"; do
|
||||
cd ~/$repo
|
||||
scp -q -r -o BatchMode=yes -o StrictHostKeyChecking=no l_samenv@linse-c:gitea/hooks .git/
|
||||
grep -q 'https://gitea.psi.ch' .git/config || git remote set-url origin https://gitea.psi.ch/linse/${repo}.git
|
||||
grep -q "$PWD/.git/hooks/get_gitea_token" .git/config || git config credential.helper "$PWD/.git/hooks/get_gitea_token"
|
||||
done
|
||||
)
|
||||
Reference in New Issue
Block a user