diff --git a/bashrc b/bashrc index e3d2a92..35ca618 100644 --- a/bashrc +++ b/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 diff --git a/hosts/any/bashrc b/hosts/any/bashrc index 6f6e258..bd33b90 100644 --- a/hosts/any/bashrc +++ b/hosts/any/bashrc @@ -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 diff --git a/update.sh b/update.sh index aeeeb97..5f59370 100755 --- a/update.sh +++ b/update.sh @@ -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