diff options
| -rw-r--r-- | archlinux.pkgs.d/bumblebee | 2 | ||||
| -rw-r--r-- | archlinux.pkgs.d/cynerd-pc | 2 | ||||
| -rw-r--r-- | archlinux.pkgs.d/desktop | 2 | ||||
| -rwxr-xr-x | install | 8 | ||||
| -rw-r--r-- | utils/inst | 19 | ||||
| m--------- | vim/bundle/YouCompleteMe | 0 | ||||
| m--------- | vim/bundle/lightline.vim | 0 | ||||
| m--------- | vim/bundle/syntastic | 0 | ||||
| m--------- | vim/bundle/tagbar | 0 | ||||
| m--------- | vim/bundle/tlib_vim | 0 | ||||
| m--------- | vim/bundle/vim-gitgutter | 0 | ||||
| m--------- | vim/bundle/vim-snippets | 0 |
12 files changed, 21 insertions, 12 deletions
diff --git a/archlinux.pkgs.d/bumblebee b/archlinux.pkgs.d/bumblebee index 73fa2d9..44de4bd 100644 --- a/archlinux.pkgs.d/bumblebee +++ b/archlinux.pkgs.d/bumblebee @@ -5,4 +5,4 @@ bumblebee-openrc bbswitch dnl ?? -mesa-vdpau +mesa-vdpau-nosystemd diff --git a/archlinux.pkgs.d/cynerd-pc b/archlinux.pkgs.d/cynerd-pc index b042bb3..49288fe 100644 --- a/archlinux.pkgs.d/cynerd-pc +++ b/archlinux.pkgs.d/cynerd-pc @@ -19,7 +19,7 @@ openssh-openrc asus-kbd-backlight intel-ucode -virtualgl +virtualgl-openrc lib32-nvidia-utils xf86-input-synaptics xf86-video-intel diff --git a/archlinux.pkgs.d/desktop b/archlinux.pkgs.d/desktop index 8cc5956..0d4c009 100644 --- a/archlinux.pkgs.d/desktop +++ b/archlinux.pkgs.d/desktop @@ -66,7 +66,7 @@ i3lock dmenu dunst xzoom -xorg-server +ifdef(`OPENRC',xorg-server-nosystemd,xorg-server) xorg-server-utils xorg-xinit xorg-xev @@ -42,15 +42,15 @@ fi read -p "Install VIM scripts? (Y/n) " YCM_PATH=~/.vim/bundle/YouCompleteMe if [[ $REPLY =~ ^[Yy]?$ ]]; then - YCM_REV="$(cd $YCM_PATH && git --work-tree=. rev-parse HEAD)" + # See if we have anything different from what we have in repository + YCM_REV="$(cd $YCM_PATH && git --work-tree=. diff --exit-code -s && echo y)" inst vimrc ~/.vimrc inst vim/ ~/.vim inst local/bin/vim-project-gen ~/.local/bin/vim-project-gen mkdir -p ~/.cache/vim # directory for *.swp files mkdir -p ~/.cache/vim-undo # directory for undo files - # Check if YCM was updated and if so recompile - if [ "$YCM_REV" != "$(cd $YCM_PATH && git --work-tree=. rev-parse HEAD)" ]; then ( - cd ~/.vim/bundle/YouCompleteMe + if [ "$YCM_REV" != "y" ]; then ( + cd $YCM_PATH ./install.py --clang-completer --system-libclang --racer-completer ); else echo "YouCompleteMe is not required to be recompiled" @@ -51,12 +51,21 @@ checkdiff() { fi done # Now checkout git repositories - for g in `find "$1" -name .git -type f -printf '%h '`; do + for g in `find "$1" -type d -exec test -e '{}'/.git \; -print -prune`; do G="${g#$1}" - COMMIT=$( cd "$1/$G" && git rev-parse HEAD ) - echo "Checkout of git repository: $2/$G" - # TODO this doesn't seems to work - ( cd "$2/$G" && git --work-tree=. checkout -f "$COMMIT" ) + PREV="$(pwd)" + cd "$2/$G" + # Check if we have any change at all + if git --work-tree=. diff --exit-code -s; then + echo "No difference detected in git: $2/$G" + else + echo "Checkout of git repository: $2/$G" + # Checkout all files to HEAD + git --work-tree=. checkout -f HEAD + # Update all submodules + git --work-tree=. submodule update + fi + cd "$PREV" done else dodiff "$1" "$2" diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe -Subproject 1d1a4f4cff04ed32ab924dda20666e67eabdefb +Subproject 83aea2fbe8c57927e91ad8f5583c81d07801a53 diff --git a/vim/bundle/lightline.vim b/vim/bundle/lightline.vim -Subproject 059888ab650fa192dd441e52bd9f41f08b24752 +Subproject a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2 diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic -Subproject 40ac6c462e2f76cb76d8a0f295abc358abc198b +Subproject 6fb14d624b6081459360fdbba743f82cf84c8f9 diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar -Subproject 53e9cb030e143b6286ed06255fef018265edd31 +Subproject 959f48798136bfd4ce60075d3c86c580fcf5e5c diff --git a/vim/bundle/tlib_vim b/vim/bundle/tlib_vim -Subproject 8c74564396e368788a5cb901b0e8017a3166cee +Subproject e0e4a4e0da29d781f591c0d03f27bfae90bec9f diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter -Subproject 7b81a8a22607f073b76b106e2d5e63cc936b0d2 +Subproject 1c034be0d31168c8f4770ef7b69adb67d00d6f3 diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets -Subproject e24d33f96a95332dde0edaa7e7e3e7a64244de5 +Subproject 28e9b45896cd600ff10a0565f1cbb5572061197 |