From ff931f9bcdfb16ccb9ee0c6aa0085a5688e7d2cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 25 Feb 2017 14:06:51 +0100 Subject: Update vim plugins --- vim/bundle/YouCompleteMe | 2 +- vim/bundle/lightline.vim | 2 +- vim/bundle/syntastic | 2 +- vim/bundle/tagbar | 2 +- vim/bundle/tlib_vim | 2 +- vim/bundle/vim-gitgutter | 2 +- vim/bundle/vim-snippets | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/vim/bundle/YouCompleteMe b/vim/bundle/YouCompleteMe index 1d1a4f4..83aea2f 160000 --- a/vim/bundle/YouCompleteMe +++ b/vim/bundle/YouCompleteMe @@ -1 +1 @@ -Subproject commit 1d1a4f4cff04ed32ab924dda20666e67eabdefb4 +Subproject commit 83aea2fbe8c57927e91ad8f5583c81d07801a539 diff --git a/vim/bundle/lightline.vim b/vim/bundle/lightline.vim index 059888a..a63a00d 160000 --- a/vim/bundle/lightline.vim +++ b/vim/bundle/lightline.vim @@ -1 +1 @@ -Subproject commit 059888ab650fa192dd441e52bd9f41f08b247529 +Subproject commit a63a00d548fd20457a4f31d31fb9c8fe8a7ebc2a diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic index 40ac6c4..6fb14d6 160000 --- a/vim/bundle/syntastic +++ b/vim/bundle/syntastic @@ -1 +1 @@ -Subproject commit 40ac6c462e2f76cb76d8a0f295abc358abc198bb +Subproject commit 6fb14d624b6081459360fdbba743f82cf84c8f92 diff --git a/vim/bundle/tagbar b/vim/bundle/tagbar index 53e9cb0..959f487 160000 --- a/vim/bundle/tagbar +++ b/vim/bundle/tagbar @@ -1 +1 @@ -Subproject commit 53e9cb030e143b6286ed06255fef018265edd311 +Subproject commit 959f48798136bfd4ce60075d3c86c580fcf5e5c5 diff --git a/vim/bundle/tlib_vim b/vim/bundle/tlib_vim index 8c74564..e0e4a4e 160000 --- a/vim/bundle/tlib_vim +++ b/vim/bundle/tlib_vim @@ -1 +1 @@ -Subproject commit 8c74564396e368788a5cb901b0e8017a3166cee9 +Subproject commit e0e4a4e0da29d781f591c0d03f27bfae90bec9fe diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter index 7b81a8a..1c034be 160000 --- a/vim/bundle/vim-gitgutter +++ b/vim/bundle/vim-gitgutter @@ -1 +1 @@ -Subproject commit 7b81a8a22607f073b76b106e2d5e63cc936b0d25 +Subproject commit 1c034be0d31168c8f4770ef7b69adb67d00d6f3d diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets index e24d33f..28e9b45 160000 --- a/vim/bundle/vim-snippets +++ b/vim/bundle/vim-snippets @@ -1 +1 @@ -Subproject commit e24d33f96a95332dde0edaa7e7e3e7a64244de56 +Subproject commit 28e9b45896cd600ff10a0565f1cbb55720611976 -- cgit v1.2.3 From e7086db0959d70e51cb04d8821d6b8b13ebf8878 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 25 Feb 2017 19:30:37 +0100 Subject: Update the way git repositories are handled --- install | 8 ++++---- utils/inst | 19 ++++++++++++++----- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/install b/install index 0768586..ceee9be 100755 --- a/install +++ b/install @@ -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" diff --git a/utils/inst b/utils/inst index c3c26e2..cb1f658 100644 --- a/utils/inst +++ b/utils/inst @@ -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" -- cgit v1.2.3 From 356f7434da419d1a65a74423a99656653a28fb03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Sat, 25 Feb 2017 20:11:20 +0100 Subject: Revert to nosystemd xorg Xorg is now updated and contains patches for new nvidia configuration, so I can use nosystemd packages again. --- archlinux.pkgs.d/bumblebee | 2 +- archlinux.pkgs.d/cynerd-pc | 2 +- archlinux.pkgs.d/desktop | 2 +- 3 files changed, 3 insertions(+), 3 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 -- cgit v1.2.3