Fix: Powerline & update.sh
This commit is contained in:
parent
2866981858
commit
4c3e8d019a
3 changed files with 4 additions and 5 deletions
2
bashrc
2
bashrc
|
@ -51,7 +51,7 @@ export MC_SKIN=$HOME/.mc/lib/solarized.ini
|
|||
|
||||
# Functions
|
||||
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
|
||||
|
|
|
@ -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
|
||||
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
|
||||
echo no
|
||||
source ~/.local/lib/python${PYVERSION}/site-packages/powerline/bindings/bash/powerline.sh
|
||||
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
|
||||
fi
|
||||
|
|
|
@ -3,9 +3,9 @@
|
|||
GIT_DIRS=(. ~/.vim/bundle ~/.config/nvim ~/.tmux/plugins/tpm)
|
||||
for dir in ${GIT_DIRS[@]} ; do
|
||||
if [ -d "$dir" ] ; then
|
||||
git -C "$dir" git stash
|
||||
git -C "$dir" stash
|
||||
git -C "$dir" pull
|
||||
git -C "$dir" git stash pop
|
||||
git -C "$dir" stash pop
|
||||
else
|
||||
echo "Skipping: $dir"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue