Fix: Powerline & update.sh

This commit is contained in:
nold 2022-04-02 15:50:26 +02:00
parent 2866981858
commit 4c3e8d019a
3 changed files with 4 additions and 5 deletions

2
bashrc
View file

@ -51,7 +51,7 @@ export MC_SKIN=$HOME/.mc/lib/solarized.ini
# Functions # Functions
function json2yaml { function json2yaml {
python3 -c 'import sys, yaml, json; print(yaml.dump(json.loads(sys.stdin.read())))' cat $@ | python3 -c 'import sys, yaml, json; print(yaml.dump(json.loads(sys.stdin.read())))'
} }
# Aliases # Aliases

View file

@ -30,8 +30,7 @@ if [ -f $HOME/.venv/lib/python${PYVERSION}/site-packages/powerline/bindings/bash
# source $HOME/.venv/lib/python${PYVERSION}/site-packages/powerline/bindings/bash/powerline.sh # source $HOME/.venv/lib/python${PYVERSION}/site-packages/powerline/bindings/bash/powerline.sh
elif [ -f ~/.local/lib/python${PYVERSION}/site-packages/powerline/bindings/bash/powerline.sh ] ; then elif [ -f ~/.local/lib/python${PYVERSION}/site-packages/powerline/bindings/bash/powerline.sh ] ; then
#source ~/.local/lib/python${PYVERSION}/site-packages/powerline/bindings/bash/powerline.sh source ~/.local/lib/python${PYVERSION}/site-packages/powerline/bindings/bash/powerline.sh
echo no
elif [ -f /usr/local/lib/python${PYVERSION}/dist-packages/powerline/bindings/bash/powerline.sh ]; then elif [ -f /usr/local/lib/python${PYVERSION}/dist-packages/powerline/bindings/bash/powerline.sh ]; then
source /usr/local/lib/python${PYVERSION}/dist-packages/powerline/bindings/bash/powerline.sh source /usr/local/lib/python${PYVERSION}/dist-packages/powerline/bindings/bash/powerline.sh
fi fi

View file

@ -3,9 +3,9 @@
GIT_DIRS=(. ~/.vim/bundle ~/.config/nvim ~/.tmux/plugins/tpm) GIT_DIRS=(. ~/.vim/bundle ~/.config/nvim ~/.tmux/plugins/tpm)
for dir in ${GIT_DIRS[@]} ; do for dir in ${GIT_DIRS[@]} ; do
if [ -d "$dir" ] ; then if [ -d "$dir" ] ; then
git -C "$dir" git stash git -C "$dir" stash
git -C "$dir" pull git -C "$dir" pull
git -C "$dir" git stash pop git -C "$dir" stash pop
else else
echo "Skipping: $dir" echo "Skipping: $dir"
fi fi