search

jonallured / dotfiles

Here be my dotfiles
7 stars 0 forks source link

Week 37 - juggernaut #190

Closed jonallured closed 4 years ago

jonallured commented 4 years ago

Terminal Stuff

Filesystem Housekeeping

Check for Updates

Stay in Sync

Finishing Up

jonallured commented 4 years ago

sharpen.log

``` + brew upgrade asdf bat fzf gh git heroku hokusai httpie hub macvim the_silver_searcher tmux yarn zsh-completions Updating Homebrew... ==> Auto-updated Homebrew! Updated 8 taps (heroku/brew, thoughtbot/formulae, homebrew/cask-versions, homebrew/core, homebrew/cask, homebrew/services, mongodb/brew and github/gh). ==> New Formulae cdktf clang-format@8 croc diskonaut httpx ioctl localstack mhonarc openfst ormolu periscope podman snap sponge ==> Updated Formulae Updated 2410 formulae. ==> New Casks aleph-one blender-lts box-tools cisco-jabber cloudflare-warp daedalus-flight fastclicker flying-carpet gotomeeting klogg koodo-reader marathon-infinity marathon2 naver-whale nocturn pb pdf-over phd2 repoz silnite toggl-track toolreleases twilioquest zbuc-imgur zprint ==> Updated Casks 115browser 1password-cli 4k-stogram a-better-finder-rename abscissa abstract activedock aerial aircall alfaview alfred alt-tab altair-graphql-client amd-power-gadget android-studio-preview-beta android-studio-preview-canary anki another-redis-desktop-manager anybar anydesk anzeigenchef app-cleaner appcode appgate-sdp-client appium aquaskk aspera-connect audirvana authy aviatrix-vpn-client aws-vault axe-edit-iii axe-electrum axure-rp backblaze baidunetdisk balenaetcher banking-4 beatunes beekeeper-studio betterzip biscuit blender blink1control blitz blizz bluejeans boostnote bootstrap-studio bot-framework-emulator brave-browser brave-browser-beta brave-browser-dev bria brook browserosaurus burp-suite busycal busycontacts c0re100-qbittorrent cabal cacher calendar-366 camera-live camo-studio camtasia cctalk chalk chef-workstation chirp chromedriver chromium clash-for-windows clashx cleanmymac cleanshot clion clipgrab cmake cockatrice cocktail cookie cool-retro-term couchbase-server-community couchbase-server-enterprise craftmanager cryo cryptomator crystalmaker cutter daedalus-mainnet daisydisk dash data-science-studio datadog-agent datovka dbeaver-community dbeaver-enterprise dbschema dcp-o-matic dcp-o-matic-batch-converter dcp-o-matic-encode-server dcp-o-matic-kdm-creator dcp-o-matic-player decrediton deeper detectx-swift digikam djay-pro docker-edge dosbox-x dotnet-sdk-preview downie dropbox dropbox-beta duet duo-connect dynobase easyeda electron element eloston-chromium elpass epichrome eudic eve-launcher exodus extraterm fanny fantastical feishu file-juicer filemaker-pro final-cut-library-manager finicky firefox firefox-esr flash-npapi flash-player flash-player-debugger flash-player-debugger-npapi flash-player-debugger-ppapi flash-ppapi flipper fm3-edit fontgoggles fork forklift framer free-download-manager freeplane freesmug-chromium freeze frhelper fsnotes funter futuniuniu geneious-prime geogebra get-backup-pro get-iplayer-automator gifox github gitkraken gitup gns3 google-chrome google-cloud-sdk grids hand-mirror hbuilderx hiddenbar hookshot hstracker http-toolkit hydrogen ibored icollections icq id3-editor igv ilok-license-manager imgotv inkdrop insync intune-company-portal iterm2-beta ivideonclient jabref jabt-flow jami jamovi jaxx-liberty jedit jellyfin jetbrains-toolbox jettison joplin josm julia kafka-tool katalon-studio keep-it keepingyouawake keka-beta kext-updater keysmith kite kiwix knime kodelife kubernetic kugoumusic kui lark lastpass launchbar lbry libreoffice libreoffice-language-pack liclipse lifesize lingon-x loaf local lockrattler logos loom love lrtimelapse maccy maciasl mailmate maintenance marathon marginnote marked marshallofsound-google-play-music-player marvel marvin masterway-note mathpix-snipping-tool matterhorn mattermost memory mendeley-reference-manager meshlab metasploit microsoft-azure-storage-explorer microsoft-edge microsoft-edge-beta microsoft-edge-dev middle milanote min mini-program-studio missive mkvtoolnix mochi mongodb-compass mongodb-compass-isolated-edition mongodb-compass-readonly mpv multibit-hd multitouch mumu musicbrainz-picard nano navicat-for-mariadb navicat-for-oracle navicat-for-sql-server netron netxms-console nextcloud nordvpn nosqlbooster-for-mongodb nrlquaker-winbox nteract nuclear obsidian ocenaudio odrive omnifocus onyx oolite openmsx openphone openrefine openscad-snapshot openvpn-connect opera opera-beta opera-developer orange pagico paperspace parallels-toolbox pastebot pcoipclient permute phpstorm pixelsnap plex plex-media-server pock pomotroid popo portfolioperformance postman powerphotos preform pritunl private-internet-access privatevpn proclaim profind propresenter protonvpn prowritingaid proxyman prudent psychopy publish-or-perish pycharm pycharm-ce pycharm-ce-with-anaconda-plugin pycharm-edu pycharm-with-anaconda-plugin pyfa qcad qiyimedia qownnotes qt-creator quail quickbooks-online quicken quickhash quip rambox razorsql rcloneosx receipts rectangle redisinsight refined-github-safari remember-the-milk remote-desktop-manager remote-desktop-manager-free responsively rhinoceros ringcentral robo-3t rstudio-preview rubitrack-pro rubymine runjs sabnzbd screen screenflick screenflow scrutiny segger-embedded-studio-for-arm sensei sequel-ace session shift signal signal-beta silentknight sipgate-softphone sizzy sketch skype slack slack-beta slite smart-converter-pro smlnj snes9x snipaste softorino-youtube-converter softube-central soulver spires springtoolsuite stats storyboarder streamlabs-obs studiolinkstandalone sublime-merge supercollider superproductivity supertuxkart swiftformat-for-xcode tableau-prep tableplus teamviewer telavox-flow telegram tempo terminus texstudio tg-pro thedesk thunderbird ti-connect-ce ticktick tiger-trade tinymediamanager tor-browser tor-browser-alpha trilium-notes tunnelblick tunnelblick-beta tuxera-ntfs tweetbot typora ubersicht ueli ultimaker-cura unity universal-media-server upwork usenapp uu-booster vagrant vassal vellum vidrio virtualbox virtualbox-extension-pack visual-paradigm visual-paradigm-ce visual-studio visual-studio-code visual-studio-code-insiders visualvm vivaldi vmware-horizon-client vnote voov-meeting vorta vscodium vuescan watchguard-mobile-vpn-with-ssl waterfox-current wavebox webcatalog webots webtorrent wechatwebdevtools wechatwork whale whalebird whatsapp wickrme wondershare-uniconverter wordpresscom workflowy wormhole wpsoffice xaos xctu xlink-kai yacreader yandex-disk yinxiangbiji yojimbo youdaodict youku yyets zalo zappy zeebe-modeler zeplin zoom-for-it-admins zoomus zotero ==> Deleted Casks alephone box-edit ghost imgur kindlegen mongodb-compass-community phiewer podman sound-blaster-command toggl Warning: Treating macvim as a formula. For the cask, use homebrew/cask/macvim Warning: bat 0.15.4 already installed Warning: fzf 0.22.0 already installed Warning: git 2.28.0 already installed Warning: artsy/formulas/hokusai 0.5.11 already installed Warning: httpie 2.2.0 already installed Warning: hub 2.14.2 already installed Warning: macvim 8.2-165_1 already installed Warning: the_silver_searcher 2.2.0 already installed Warning: tmux 3.1b already installed Warning: zsh-completions 0.32.0 already installed ==> Upgrading 4 outdated packages: asdf 0.7.8 -> 0.8.0 gh 0.11.1 -> 0.12.0 heroku/brew/heroku 7.42.8 -> 7.42.13 yarn 1.22.4 -> 1.22.5 ==> Upgrading asdf 0.7.8 -> 0.8.0 ==> Downloading https://homebrew.bintray.com/bottles/automake-1.16.2_1.catalina.bottle.tar.gz ==> Downloading from https://d29vzk4ow07wi7.cloudfront.net/06c47bab91fc9c8a912a162f02fbf4c6d03b75820110250d2408e694bacd8236?response-content-disposition=attachment%3Bfilename%3D%22automake-1.16.2_1.catalina.bottle.tar.gz%22&Policy=eyJTdGF0ZW1lbnQiOiBbeyJSZXNvdXJjZSI6Imh0dHAqOi8vZDI5dnprNG93MDd3aTcuY2xvdWRmcm9udC5uZXQvMDZjNDdiYWI5MWZjOWM4YTkxMmExNjJmMDJmYmY0YzZkMDNiNzU4MjAxMTAyNTBkMjQwOGU2OTRiYWNkODIzNj9yZXNwb25zZS1jb250ZW50LWRpc3Bvc2l0aW9uPWF0dGFjaG1lbnQlM0JmaWxlbmFtZSUzRCUyMmF1dG9tYWtlLTEuMTYuMl8xLmNhdGFsaW5hLmJvdHRsZS50YXIuZ3olMjIiLCJDb25kaXRpb24iOnsiRGF0ZUxlc3NUaGFuIjp7IkFXUzpFcG9jaFRpbWUiOjE1OTk1ODE4NzV9LCJJcEFkZHJlc3MiOnsiQVdTOlNvdXJjZUlwIjoiMC4wLjAuMC8wIn19fV19&Signature=I7nEM2znvH~H7N~15fAlID-x~cJadXHU0Cv3ITdeNTyqUWz3ez~jb9SjEQUPdAZlJxZ6AwXTSJVeja9Msl9nM7tjuZ5xjNt6QbDgOor0TgKSqw0W9VESufwhdL3ZvuIOV7BeH9yXD2l-AFT4OxOVkYFaZ5LHOV5rQYDGpHnGkcYi~ArQb~aB81YprcXJu77Lr03DruaXw4YYzk6Ly9Ttn8~mQaiLzQlCAEJmYQN-bn2ucSPS92gRkwDLPddXvhhcjSz7iPwyWNrnsGtUPxuaw9w-Vie3P~1oR0tmYS0Yom09ZnSKdpz9I1gLm~ygpu3TwaoCudBE0~mcogYKcUh1DQ__&Key-Pair-Id=APKAIFKFWOMXM2UMTSFA ==> Downloading https://homebrew.bintray.com/bottles/libtool-2.4.6_2.catalina.bottle.tar.gz ==> Downloading from https://d29vzk4ow07wi7.cloudfront.net/af317b35d0a394b7ef55fba4950735b0392d9f31bececebf9c412261c23a01fc?response-content-disposition=attachment%3Bfilename%3D%22libtool-2.4.6_2.catalina.bottle.tar.gz%22&Policy=eyJTdGF0ZW1lbnQiOiBbeyJSZXNvdXJjZSI6Imh0dHAqOi8vZDI5dnprNG93MDd3aTcuY2xvdWRmcm9udC5uZXQvYWYzMTdiMzVkMGEzOTRiN2VmNTVmYmE0OTUwNzM1YjAzOTJkOWYzMWJlY2VjZWJmOWM0MTIyNjFjMjNhMDFmYz9yZXNwb25zZS1jb250ZW50LWRpc3Bvc2l0aW9uPWF0dGFjaG1lbnQlM0JmaWxlbmFtZSUzRCUyMmxpYnRvb2wtMi40LjZfMi5jYXRhbGluYS5ib3R0bGUudGFyLmd6JTIyIiwiQ29uZGl0aW9uIjp7IkRhdGVMZXNzVGhhbiI6eyJBV1M6RXBvY2hUaW1lIjoxNTk5NTgxODc3fSwiSXBBZGRyZXNzIjp7IkFXUzpTb3VyY2VJcCI6IjAuMC4wLjAvMCJ9fX1dfQ__&Signature=YnGMMu6hZzmJCvu--khQN0gMLMSBVy~-K~R7LANkd0j47AfwJpOL~I02T1HkT2iBQfYZvg4GPRdVIlPfcPXZkKG7X6cCUuQbDuuZaxVnT77Ouj6GVKS2rurOx~3IGO88qV~7nYeIqqSh47vIQi9OjOdwL52G-bmD7Ykf4L6H2pRtbcc6zmMCSU~anl~6YSEUpjNYsK5V60kANGdlc0NA6c~P5o76i4iMciPrryXr1Q8-P7OyFbV4ddBkPykAbEmsOkgqBA2fvSTWNCn7xhY-pC9YgiT1Q8XXja0LQAnRPOr7nvENUKBFBT3H2mWW9OuZ-sPASXv5gFgqc1OGT1Qedg__&Key-Pair-Id=APKAIFKFWOMXM2UMTSFA ==> Downloading https://homebrew.bintray.com/bottles/unixodbc-2.3.8.catalina.bottle.tar.gz ==> Downloading https://github.com/asdf-vm/asdf/archive/v0.8.0.tar.gz ==> Downloading from https://codeload.github.com/asdf-vm/asdf/tar.gz/v0.8.0 ==> Installing dependencies for asdf: automake, libtool and unixodbc ==> Installing asdf dependency: automake ==> Pouring automake-1.16.2_1.catalina.bottle.tar.gz 🍺 /usr/local/Cellar/automake/1.16.2_1: 131 files, 3.4MB ==> Installing asdf dependency: libtool ==> Pouring libtool-2.4.6_2.catalina.bottle.tar.gz ==> Caveats In order to prevent conflicts with Apple's own libtool we have prepended a "g" so, you have instead: glibtool and glibtoolize. ==> Summary 🍺 /usr/local/Cellar/libtool/2.4.6_2: 71 files, 3.7MB ==> Installing asdf dependency: unixodbc ==> Pouring unixodbc-2.3.8.catalina.bottle.tar.gz 🍺 /usr/local/Cellar/unixodbc/2.3.8: 46 files, 1.9MB ==> Installing asdf ==> Caveats Bash completion has been installed to: /usr/local/etc/bash_completion.d zsh completions have been installed to: /usr/local/share/zsh/site-functions ==> Summary 🍺 /usr/local/Cellar/asdf/0.8.0: 115 files, 243KB, built in 4 seconds ==> `brew cleanup` has not been run in 30 days, running now... Removing: /usr/local/Cellar/adns/1.5.1... (14 files, 656.3KB) Removing: /usr/local/Cellar/asdf/0.7.8... (104 files, 219.6KB) Removing: /usr/local/Cellar/automake/1.16.2... (131 files, 3.4MB) Removing: /Users/jon/Library/Caches/Homebrew/awscli--2.0.42.catalina.bottle.tar.gz... (21.5MB) Removing: /Users/jon/Library/Caches/Homebrew/copy_env--0.0.2.tar.gz... (1KB) Removing: /Users/jon/Library/Caches/Homebrew/cscope--15.9.catalina.bottle.tar.gz... (178.6KB) Removing: /usr/local/Cellar/gdbm/1.18.1... (20 files, 602.8KB) Removing: /Users/jon/Library/Caches/Homebrew/gdbm--1.18.1.catalina.bottle.1.tar.gz... (196.7KB) Removing: /usr/local/Cellar/gettext/0.20.2_1... (1,923 files, 18.6MB) Removing: /Users/jon/Library/Caches/Homebrew/gettext--0.20.2.catalina.bottle.tar.gz... (8.4MB) Removing: /Users/jon/Library/Caches/Homebrew/gettext--0.20.2_1.catalina.bottle.tar.gz... (8.4MB) Removing: /Users/jon/Library/Caches/Homebrew/gh--0.11.1.tar.gz... (6MB) Removing: /Users/jon/Library/Caches/Homebrew/gmp--6.2.0.catalina.bottle.tar.gz... (1022.7KB) Removing: /Users/jon/Library/Caches/Homebrew/gnupg--2.2.21.catalina.bottle.tar.gz... (4.3MB) Removing: /Users/jon/Library/Caches/Homebrew/gnutls--3.6.14.catalina.bottle.tar.gz... (3MB) Removing: /Users/jon/Library/Caches/Homebrew/heroku--7.42.8.tar.xz... (5.4MB) Removing: /Users/jon/Library/Caches/Homebrew/heroku-node--12.16.2.tar.xz... (9.5MB) Removing: /Users/jon/Library/Caches/Homebrew/libassuan--2.5.3.catalina.bottle.tar.gz... (148.8KB) Removing: /usr/local/Cellar/libevent/2.1.11_1... (1,063 files, 5MB) Removing: /usr/local/Cellar/libffi/3.2.1... (16 files, 300.7KB) Removing: /usr/local/Cellar/libgcrypt/1.8.5... (22 files, 2.6MB) Removing: /Users/jon/Library/Caches/Homebrew/libgpg-error--1.38.catalina.bottle.tar.gz... (301KB) Removing: /Users/jon/Library/Caches/Homebrew/libidn2--2.3.0.catalina.bottle.tar.gz... (233.6KB) Removing: /usr/local/Cellar/libksba/1.3.5... (14 files, 350.4KB) Removing: /Users/jon/Library/Caches/Homebrew/libtasn1--4.16.0.catalina.bottle.tar.gz... (122.2KB) Removing: /usr/local/Cellar/libtool/2.4.6_1... (71 files, 3.7MB) Removing: /Users/jon/Library/Caches/Homebrew/libunistring--0.9.10.catalina.bottle.tar.gz... (1.4MB) Removing: /usr/local/Cellar/libyaml/0.2.2... (9 files, 311.3KB) Removing: /usr/local/Cellar/libyaml/0.2.4... (10 files, 322.6KB) Removing: /Users/jon/Library/Caches/Homebrew/lua--5.3.5_1.catalina.bottle.tar.gz... (113.7KB) Removing: /usr/local/Cellar/nettle/3.4.1... (85 files, 2.1MB) Removing: /Users/jon/Library/Caches/Homebrew/npth--1.6.catalina.bottle.tar.gz... (23.7KB) Removing: /Users/jon/Library/Caches/Homebrew/p11-kit--0.23.20.catalina.bottle.tar.gz... (707.1KB) Removing: /Users/jon/Library/Caches/Homebrew/p11-kit--0.23.20_1.catalina.bottle.tar.gz... (707.6KB) Removing: /Users/jon/Library/Caches/Homebrew/pinentry--1.1.0_1.catalina.bottle.tar.gz... (102.7KB) Removing: /usr/local/Cellar/python/3.7.8... (4,007 files, 61.4MB) Removing: /usr/local/Cellar/python@3.8/3.8.2... (4,124 files, 63MB) Removing: /usr/local/Cellar/python@3.8/3.8.3... (4,140 files, 63.4MB) Removing: /Users/jon/Library/Caches/Homebrew/ruby--2.7.1.catalina.bottle.tar.gz... (9.4MB) Removing: /Users/jon/Library/Caches/Homebrew/slackcat--1.6.catalina.bottle.tar.gz... (5MB) Removing: /usr/local/Cellar/sqlite/3.32.3... (11 files, 4MB) Removing: /Users/jon/Library/Caches/Homebrew/sqlite--3.32.3.catalina.bottle.tar.gz... (1.9MB) Removing: /usr/local/Cellar/unbound/1.10.0... (57 files, 5.1MB) Removing: /usr/local/Cellar/unixodbc/2.3.7... (46 files, 1.9MB) Removing: /Users/jon/Library/Logs/Homebrew/gh... (108B) Removing: /Users/jon/Library/Logs/Homebrew/gdbm... (64B) Removing: /Users/jon/Library/Logs/Homebrew/python... (3 files, 148.4KB) Removing: /Users/jon/Library/Logs/Homebrew/awscli... (64B) Removing: /Users/jon/Library/Logs/Homebrew/python@3.8... (3 files, 172KB) Removing: /Users/jon/Library/Logs/Homebrew/git... (64B) Pruned 1 symbolic links and 3 directories from /usr/local ==> Upgrading gh 0.11.1 -> 0.12.0 ==> Downloading https://homebrew.bintray.com/bottles/gh-0.12.0.catalina.bottle.tar.gz ==> Pouring gh-0.12.0.catalina.bottle.tar.gz ==> Caveats Bash completion has been installed to: /usr/local/etc/bash_completion.d zsh completions have been installed to: /usr/local/share/zsh/site-functions ==> Summary 🍺 /usr/local/Cellar/gh/0.12.0: 49 files, 16MB Removing: /usr/local/Cellar/gh/0.11.1... (43 files, 17.3MB) ==> Upgrading heroku/brew/heroku 7.42.8 -> 7.42.13 ==> Downloading https://cli-assets.heroku.com/heroku-v7.42.13/heroku-v7.42.13.tar.xz Warning: Your Xcode (11.4) is outdated. Please update to Xcode 11.5 (or delete it). Xcode can be updated from the App Store. ==> Caveats To use the Heroku CLI's autocomplete -- Via homebrew's shell completion: 1) Follow homebrew's install instructions https://docs.brew.sh/Shell-Completion NOTE: For zsh, as the instructions mention, be sure compinit is autoloaded and called, either explicitly or via a framework like oh-my-zsh. 2) Then run $ heroku autocomplete --refresh-cache OR Use our standalone setup: 1) Run and follow the install steps: $ heroku autocomplete Bash completion has been installed to: /usr/local/etc/bash_completion.d zsh completions have been installed to: /usr/local/share/zsh/site-functions ==> Summary 🍺 /usr/local/Cellar/heroku/7.42.13: 27,404 files, 59.3MB, built in 37 seconds Removing: /usr/local/Cellar/heroku/7.42.8... (42,563 files, 142.6MB) ==> Upgrading yarn 1.22.4 -> 1.22.5 ==> Downloading https://homebrew.bintray.com/bottles/icu4c-67.1.catalina.bottle.tar.gz ==> Downloading from https://d29vzk4ow07wi7.cloudfront.net/2d1e91b5127f66e7941790c004817c94c892725c88f84f1e4c37297fcbc0c72f?response-content-disposition=attachment%3Bfilename%3D%22icu4c-67.1.catalina.bottle.tar.gz%22&Policy=eyJTdGF0ZW1lbnQiOiBbeyJSZXNvdXJjZSI6Imh0dHAqOi8vZDI5dnprNG93MDd3aTcuY2xvdWRmcm9udC5uZXQvMmQxZTkxYjUxMjdmNjZlNzk0MTc5MGMwMDQ4MTdjOTRjODkyNzI1Yzg4Zjg0ZjFlNGMzNzI5N2ZjYmMwYzcyZj9yZXNwb25zZS1jb250ZW50LWRpc3Bvc2l0aW9uPWF0dGFjaG1lbnQlM0JmaWxlbmFtZSUzRCUyMmljdTRjLTY3LjEuY2F0YWxpbmEuYm90dGxlLnRhci5neiUyMiIsIkNvbmRpdGlvbiI6eyJEYXRlTGVzc1RoYW4iOnsiQVdTOkVwb2NoVGltZSI6MTU5OTU4MTk2NH0sIklwQWRkcmVzcyI6eyJBV1M6U291cmNlSXAiOiIwLjAuMC4wLzAifX19XX0_&Signature=LU5~2XDQlVYFdhtd49lTJxxySwhB9hS3D5-fAxrT53eZjrDtx-MvFsMTkZ81QZ7rPqJHooHijySbUsligkyDQZowgLMjg3K7x04Mn6ylb7uJAevm4Sq2WSYwgZCDhit6ug1qjZ1Rb9GbvKBfbt7Z-KBdVKBr7uKjwYAWfrVzETam~LFwjU9I2cDTPy2-0ooF4JLfD7wCBa0WnKJ3yfX2nLCIZqvEGpHoaNyxPunZp29iPWdWfBg5wGJVzrz4xxNU690TncEQiTxeylThL~Q78lIW2zXQUxO-KrtPkoRFtUKWjzFRVeoEPqKGiOWDr4dpheIYHJd58NZ-DyIq3NC8uA__&Key-Pair-Id=APKAIFKFWOMXM2UMTSFA ==> Downloading https://homebrew.bintray.com/bottles/node-14.9.0.catalina.bottle.tar.gz ==> Downloading from https://d29vzk4ow07wi7.cloudfront.net/df9d87a46dfa38140b2742ab1b00121825b92aabbcd98be2b8c7b4900752f749?response-content-disposition=attachment%3Bfilename%3D%22node-14.9.0.catalina.bottle.tar.gz%22&Policy=eyJTdGF0ZW1lbnQiOiBbeyJSZXNvdXJjZSI6Imh0dHAqOi8vZDI5dnprNG93MDd3aTcuY2xvdWRmcm9udC5uZXQvZGY5ZDg3YTQ2ZGZhMzgxNDBiMjc0MmFiMWIwMDEyMTgyNWI5MmFhYmJjZDk4YmUyYjhjN2I0OTAwNzUyZjc0OT9yZXNwb25zZS1jb250ZW50LWRpc3Bvc2l0aW9uPWF0dGFjaG1lbnQlM0JmaWxlbmFtZSUzRCUyMm5vZGUtMTQuOS4wLmNhdGFsaW5hLmJvdHRsZS50YXIuZ3olMjIiLCJDb25kaXRpb24iOnsiRGF0ZUxlc3NUaGFuIjp7IkFXUzpFcG9jaFRpbWUiOjE1OTk1ODE5NjV9LCJJcEFkZHJlc3MiOnsiQVdTOlNvdXJjZUlwIjoiMC4wLjAuMC8wIn19fV19&Signature=kxVu97KXkTMrnsz7gAIkxrfPbR0p2ZFPP0Fo2HVjn0~hYEDbihBEGYSMpYZLN1CfiGC~2SBEhGBNSTQGR-Dkf87VtUzeLyKxkwNVJa760fhri5m9~1ncd1NYW-guA2T7gWqau6itNrBO1MpQ2IXd~qdqIFOXUyBMQQJDNTSMpMnVK22aHCRRUMdkH5KULoRaX~j~mdjQi-gLYEgPGm67EKRK4w2n~9lLgBnwcouSSDHdeK7qIuuA~NdhLirDABk3eOFPIYpvF~vf0GlpaAlQsiDwgrbQtKovcELkaCF3yQtIhmjfZJ8XhKFnh4pmciPVKzGQ6ioqDFoIPjL9li4qJA__&Key-Pair-Id=APKAIFKFWOMXM2UMTSFA ==> Downloading https://yarnpkg.com/downloads/1.22.5/yarn-v1.22.5.tar.gz ==> Downloading from https://github-production-release-asset-2e65be.s3.amazonaws.com/49970642/2377bf00-e81c-11ea-92ab-28a657cb6dd4?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Credential=AKIAIWNJYAX4CSVEH53A%2F20200908%2Fus-east-1%2Fs3%2Faws4_request&X-Amz-Date=20200908T160559Z&X-Amz-Expires=300&X-Amz-Signature=39954f80105839c7fe73414308678cc71dc118c00288b17c465e600beed84983&X-Amz-SignedHeaders=host&actor_id=0&key_id=0&repo_id=49970642&response-content-disposition=attachment%3B%20filename%3Dyarn-v1.22.5.tar.gz&response-content-type=application%2Foctet-stream ==> Installing dependencies for yarn: icu4c and node ==> Installing yarn dependency: icu4c ==> Pouring icu4c-67.1.catalina.bottle.tar.gz ==> Caveats icu4c is keg-only, which means it was not symlinked into /usr/local, because macOS provides libicucore.dylib (but nothing else). If you need to have icu4c first in your PATH run: echo 'export PATH="/usr/local/opt/icu4c/bin:$PATH"' >> ~/.zshrc echo 'export PATH="/usr/local/opt/icu4c/sbin:$PATH"' >> ~/.zshrc For compilers to find icu4c you may need to set: export LDFLAGS="-L/usr/local/opt/icu4c/lib" export CPPFLAGS="-I/usr/local/opt/icu4c/include" ==> Summary 🍺 /usr/local/Cellar/icu4c/67.1: 258 files, 71.2MB ==> Installing yarn dependency: node ==> Pouring node-14.9.0.catalina.bottle.tar.gz ==> Caveats Bash completion has been installed to: /usr/local/etc/bash_completion.d ==> Summary 🍺 /usr/local/Cellar/node/14.9.0: 4,670 files, 61.9MB ==> Installing yarn 🍺 /usr/local/Cellar/yarn/1.22.5: 14 files, 5MB, built in 5 seconds Removing: /usr/local/Cellar/yarn/1.22.4... (14 files, 5MB) ==> Upgrading 1 dependent: postgresql 12.2 -> 12.4 ==> Upgrading postgresql 12.2 -> 12.4 ==> Downloading https://homebrew.bintray.com/bottles/krb5-1.18.2.catalina.bottle.tar.gz ==> Downloading from https://d29vzk4ow07wi7.cloudfront.net/db39e4570abab6459fb857cb41fdd0a375810d25a4c712f4504585255397d150?response-content-disposition=attachment%3Bfilename%3D%22krb5-1.18.2.catalina.bottle.tar.gz%22&Policy=eyJTdGF0ZW1lbnQiOiBbeyJSZXNvdXJjZSI6Imh0dHAqOi8vZDI5dnprNG93MDd3aTcuY2xvdWRmcm9udC5uZXQvZGIzOWU0NTcwYWJhYjY0NTlmYjg1N2NiNDFmZGQwYTM3NTgxMGQyNWE0YzcxMmY0NTA0NTg1MjU1Mzk3ZDE1MD9yZXNwb25zZS1jb250ZW50LWRpc3Bvc2l0aW9uPWF0dGFjaG1lbnQlM0JmaWxlbmFtZSUzRCUyMmtyYjUtMS4xOC4yLmNhdGFsaW5hLmJvdHRsZS50YXIuZ3olMjIiLCJDb25kaXRpb24iOnsiRGF0ZUxlc3NUaGFuIjp7IkFXUzpFcG9jaFRpbWUiOjE1OTk1ODE5ODd9LCJJcEFkZHJlc3MiOnsiQVdTOlNvdXJjZUlwIjoiMC4wLjAuMC8wIn19fV19&Signature=JtUl~99ysY9YD~dlGGxr6t2gtSa53Oxt3zqX53fk~-9oQiXw~61yqffCq-lE0vXLNyElsUU~MUaGatSr0~YQ~oL4TGPrIymPReT2mae~eDdzADyOggEi2kgd90V7WceBs0jA8~mycvljdrRuk0C0PzrjNJCNUtQcT-JwovkYDvr~tu-e2j7~YkU2u8PimjOcIlwauiDRKfNpEKungSwM6vz8WaPK1Kk5tjCLUjBkJ0u5mYK7q8bGhUBrqACVPnqzWnAE6HM6v-J36SQKRflNKtMiaLx6Uooym2obxBszuI2ubxnnwSKUGd17P1vgFiMJQS-kRfJnN53I-XtrTLNN6Q__&Key-Pair-Id=APKAIFKFWOMXM2UMTSFA ==> Downloading https://homebrew.bintray.com/bottles/postgresql-12.4.catalina.bottle.tar.gz ==> Downloading from https://d29vzk4ow07wi7.cloudfront.net/cf7e64a4a702db6667582d6a8d83107b67d1457a623fbe04426d9702023612fa?response-content-disposition=attachment%3Bfilename%3D%22postgresql-12.4.catalina.bottle.tar.gz%22&Policy=eyJTdGF0ZW1lbnQiOiBbeyJSZXNvdXJjZSI6Imh0dHAqOi8vZDI5dnprNG93MDd3aTcuY2xvdWRmcm9udC5uZXQvY2Y3ZTY0YTRhNzAyZGI2NjY3NTgyZDZhOGQ4MzEwN2I2N2QxNDU3YTYyM2ZiZTA0NDI2ZDk3MDIwMjM2MTJmYT9yZXNwb25zZS1jb250ZW50LWRpc3Bvc2l0aW9uPWF0dGFjaG1lbnQlM0JmaWxlbmFtZSUzRCUyMnBvc3RncmVzcWwtMTIuNC5jYXRhbGluYS5ib3R0bGUudGFyLmd6JTIyIiwiQ29uZGl0aW9uIjp7IkRhdGVMZXNzVGhhbiI6eyJBV1M6RXBvY2hUaW1lIjoxNTk5NTgxOTg4fSwiSXBBZGRyZXNzIjp7IkFXUzpTb3VyY2VJcCI6IjAuMC4wLjAvMCJ9fX1dfQ__&Signature=gq-oLkmKrZdB68hhIKPYcfu8F9rq2l87E~gBXRxIzzGJryXWUH9PhoeMn252dtZpbnVpfjcTTk3646LVFVUv7dvV9g7ZGrLYA5W9u7FG7oNm9Gazrcapm~mGawikXv4P2EVysBGHjm5ytNhTzB7JqioIXYvWmJyo1xGXqqd5r8KaM-LxaFhzuK0f1hRexNmFsFNmln5W0lpvFk1LeNLVtiYG1JU5-ch4qc14UO-Zsoj1~iHIyb~S4O8aXJ8XFlRoZTUZPEk1wjnDSLeCM7621h7EMIwTXbdn-l737DsZ03nXKoLelOn1ZH6OV0d5XwlnZyd1m0FuEdDK-BZwVBpi7Q__&Key-Pair-Id=APKAIFKFWOMXM2UMTSFA ==> Installing dependencies for postgresql: krb5 ==> Installing postgresql dependency: krb5 ==> Pouring krb5-1.18.2.catalina.bottle.tar.gz ==> Caveats krb5 is keg-only, which means it was not symlinked into /usr/local, because macOS already provides this software and installing another version in parallel can cause all kinds of trouble. If you need to have krb5 first in your PATH run: echo 'export PATH="/usr/local/opt/krb5/bin:$PATH"' >> ~/.zshrc echo 'export PATH="/usr/local/opt/krb5/sbin:$PATH"' >> ~/.zshrc For compilers to find krb5 you may need to set: export LDFLAGS="-L/usr/local/opt/krb5/lib" export CPPFLAGS="-I/usr/local/opt/krb5/include" ==> Summary 🍺 /usr/local/Cellar/krb5/1.18.2: 162 files, 4.0MB ==> Installing postgresql ==> Pouring postgresql-12.4.catalina.bottle.tar.gz ==> Caveats To migrate existing data from a previous major version of PostgreSQL run: brew postgresql-upgrade-database This formula has created a default database cluster with: initdb --locale=C -E UTF-8 /usr/local/var/postgres For more details, read: https://www.postgresql.org/docs/12/app-initdb.html To have launchd start postgresql now and restart at login: brew services start postgresql Or, if you don't want/need a background service you can just run: pg_ctl -D /usr/local/var/postgres start ==> Summary 🍺 /usr/local/Cellar/postgresql/12.4: 3,223 files, 37.8MB Removing: /usr/local/Cellar/postgresql/12.2... (3,218 files, 37.8MB) ==> Checking for dependents of upgraded formulae... ==> No broken dependents found! ==> Caveats ==> libtool In order to prevent conflicts with Apple's own libtool we have prepended a "g" so, you have instead: glibtool and glibtoolize. ==> asdf Bash completion has been installed to: /usr/local/etc/bash_completion.d zsh completions have been installed to: /usr/local/share/zsh/site-functions ==> gh Bash completion has been installed to: /usr/local/etc/bash_completion.d zsh completions have been installed to: /usr/local/share/zsh/site-functions ==> heroku To use the Heroku CLI's autocomplete -- Via homebrew's shell completion: 1) Follow homebrew's install instructions https://docs.brew.sh/Shell-Completion NOTE: For zsh, as the instructions mention, be sure compinit is autoloaded and called, either explicitly or via a framework like oh-my-zsh. 2) Then run $ heroku autocomplete --refresh-cache OR Use our standalone setup: 1) Run and follow the install steps: $ heroku autocomplete Bash completion has been installed to: /usr/local/etc/bash_completion.d zsh completions have been installed to: /usr/local/share/zsh/site-functions ==> icu4c icu4c is keg-only, which means it was not symlinked into /usr/local, because macOS provides libicucore.dylib (but nothing else). If you need to have icu4c first in your PATH run: echo 'export PATH="/usr/local/opt/icu4c/bin:$PATH"' >> ~/.zshrc echo 'export PATH="/usr/local/opt/icu4c/sbin:$PATH"' >> ~/.zshrc For compilers to find icu4c you may need to set: export LDFLAGS="-L/usr/local/opt/icu4c/lib" export CPPFLAGS="-I/usr/local/opt/icu4c/include" ==> node Bash completion has been installed to: /usr/local/etc/bash_completion.d ==> krb5 krb5 is keg-only, which means it was not symlinked into /usr/local, because macOS already provides this software and installing another version in parallel can cause all kinds of trouble. If you need to have krb5 first in your PATH run: echo 'export PATH="/usr/local/opt/krb5/bin:$PATH"' >> ~/.zshrc echo 'export PATH="/usr/local/opt/krb5/sbin:$PATH"' >> ~/.zshrc For compilers to find krb5 you may need to set: export LDFLAGS="-L/usr/local/opt/krb5/lib" export CPPFLAGS="-I/usr/local/opt/krb5/include" ==> postgresql To migrate existing data from a previous major version of PostgreSQL run: brew postgresql-upgrade-database This formula has created a default database cluster with: initdb --locale=C -E UTF-8 /usr/local/var/postgres For more details, read: https://www.postgresql.org/docs/12/app-initdb.html To have launchd start postgresql now and restart at login: brew services start postgresql Or, if you don't want/need a background service you can just run: pg_ctl -D /usr/local/var/postgres start + asdf plugin-update --all Updating nodejs... Already on 'master' Your branch is up to date with 'origin/master'. Updating python... Already on 'master' Your branch is up to date with 'origin/master'. Updating ruby... From https://github.com/asdf-vm/asdf-ruby aea1a94..ba495e5 master -> master aea1a94..ba495e5 master -> origin/master Already on 'master' Your branch is up to date with 'origin/master'. + asdf reshim + gem update --system Latest version already installed. Done. + npm install --global npm /Users/jon/.asdf/installs/nodejs/10.15.1/.npm/bin/npm -> /Users/jon/.asdf/installs/nodejs/10.15.1/.npm/lib/node_modules/npm/bin/npm-cli.js /Users/jon/.asdf/installs/nodejs/10.15.1/.npm/bin/npx -> /Users/jon/.asdf/installs/nodejs/10.15.1/.npm/lib/node_modules/npm/bin/npx-cli.js > npm@6.14.8 postinstall /Users/jon/.asdf/installs/nodejs/10.15.1/.npm/lib/node_modules/npm > /Users/jon/.asdf/installs/nodejs/10.15.1/.npm/lib/node_modules/.hooks/postinstall + npm@6.14.8 updated 1 package in 4.274s + nuke_modules /Users/jon/code/metaphysics/node_modules /Users/jon/code/torque/node_modules 515M cleaned up ```

replug.log

``` + PlugClean Searching for invalid plugins in /Users/jon/.vim/plugs [==========================================================] Already clean. + PlugInstall Updated. Elapsed time: 1.626273 sec. [=========================================================] - Finishing ... Done! - bufkill.vim: Already installed - fzf: Already installed - vim-hashrocket: Already installed - vim-rake: Already installed - vim-turbux: Already installed - vim-pug: Already installed - vim-ruby: Already installed - vim-textobj-user: Already installed - vim-scriptease: Already installed - vim-rsi: Already installed - tslime.vim: Already installed - vim-vividchalk: Already installed - vim-coffee-script: Already installed - vim-graphql: Already installed - vim-rhubarb: Already installed - vim-markdown: Already installed - pgsql.vim: Already installed - vim-vinegar: Already installed - vim-slim: Already installed - vim-repeat: Already installed - vim-git: Already installed - vim-commentary: Already installed - vim-blockle: Already installed - vim-endwise: Already installed - supertab: Already installed - vim-sleuth: Already installed - ack.vim: Already installed - vim-spacejam: Already installed - bufexplorer.zip: Already installed - vim-sensible: Already installed - vim-unimpaired: Already installed - vim-headfirst: Already installed - vim-json: Already installed - vim-bdubs: Already installed - vim-rails: Already installed - vim-weefactor: Already installed - vim-eunuch: Already installed - vim-railscasts: Already installed - gitv: Already installed - vim-irblack: Already installed - vim-fugitive: Already installed - vim-textobj-rubyblock: Already installed - tabular: Already installed - vim-speeddating: Already installed - ale: Already installed - vim-bundler: Already installed - vim-haml: Already installed - splitjoin.vim: Already installed - vim-jsx: Already installed - vim-abolish: Already installed - vim-ragtag: Already installed - vim-projectionist: Already installed - vim-surround: Already installed - typescript-vim: Already installed - vim-javascript: Already installed - vim-cucumber: Already installed - vim-styled-components: Already installed + PlugUpdate Updated. Elapsed time: 4.512067 sec. [=======================================================xx] - Finishing ... Done! x tslime.vim: merge: origin/master - not something we can merge x vim-turbux: merge: origin/master - not something we can merge - bufkill.vim: Already up to date. - fzf: 10 files changed, 43 insertions(+), 28 deletions(-) - vim-hashrocket: Already up to date. - vim-rake: Already up to date. - vim-pug: Already up to date. - vim-ruby: 1 file changed, 1 insertion(+), 1 deletion(-) - vim-textobj-user: Already up to date. - vim-scriptease: Already up to date. - vim-rsi: Already up to date. - vim-vividchalk: Already up to date. - vim-coffee-script: Already up to date. - vim-graphql: create mode 100644 after/indent/typescript.vim - vim-rhubarb: Already up to date. - vim-markdown: 2 files changed, 2 insertions(+), 2 deletions(-) - pgsql.vim: Already up to date. - vim-vinegar: Already up to date. - vim-slim: Already up to date. - vim-repeat: Already up to date. - vim-git: Already up to date. - vim-commentary: Already up to date. - vim-blockle: Already up to date. - vim-endwise: Already up to date. - supertab: Already up to date. - vim-sleuth: Already up to date. - ack.vim: Already up to date. - vim-spacejam: Already up to date. - bufexplorer.zip: Already up to date. - vim-sensible: Already up to date. - vim-unimpaired: Already up to date. - vim-headfirst: Already up to date. - vim-json: Already up to date. - vim-bdubs: Already up to date. - vim-rails: Already up to date. - vim-weefactor: Already up to date. - vim-eunuch: Already up to date. - vim-railscasts: Already up to date. - gitv: Already up to date. - vim-irblack: Already up to date. - vim-fugitive: 1 file changed, 1 insertion(+), 1 deletion(-) - vim-textobj-rubyblock: Already up to date. - tabular: Already up to date. - vim-speeddating: Already up to date. - ale: create mode 100644 test/test_computed_lint_file_values.vader - vim-bundler: Already up to date. - vim-haml: 1 file changed, 1 insertion(+) - splitjoin.vim: Already up to date. - vim-jsx: Already up to date. - vim-abolish: Already up to date. - vim-ragtag: Already up to date. - vim-projectionist: Already up to date. - vim-surround: Already up to date. - typescript-vim: Already up to date. - vim-javascript: Already up to date. - vim-cucumber: Already up to date. - vim-styled-components: Already up to date. + PlugDiff 7 plugin(s) updated. [=========================================================] Last update: ------------ - ale: * b4b7512 Fix a completion error (31 hours ago) * fc2a34e Merge pull request #3337 from sodapopcan/patch-1 (33 hours ago) |\ | * 417761b Fix typo (34 hours ago) * | 8950f6b Merge pull request #3334 from remi6397/bugfix/asciidoc-languagetool-typo (34 hours ago) |\ \ | |/ |/| | * 0b55098 Fix asciidoc languagetool integration (4 days ago) * | c36053d Close #3268 - Implement :ALEImport (2 days ago) * | 5bc49d2 Fix #3183 - Escape filename characters from LSP/tsserver (3 days ago) * | 152b2cb Clean up embertemplatelint code (3 days ago) |/ * 844febb Fix #3322 - Apply rename changes correctly (4 days ago) * d4a1474 feat(template-lint): Read from stdin (#2622) (8 days ago) * ac2100d Fix flake8 cd logic for invalid options (8 days ago) * cdaeca4 Add tests for \r removal (8 days ago) * 31942c9 Merge pull request #2858 from kalekseev/patch-flake8 (8 days ago) |\ | * 1462de6 Run flake8 from project root by default. (9 days ago) * | 4a91f92 Merge pull request #3078 from jgehrig/jg-issue2958 (8 days ago) |\ \ | |/ |/| | * 1c6b935 Issue 2598: Addtional ^M characters on Windows (6 months ago) * 0989da4 Merge pull request #3194 from maxwell-k/vint (10 days ago) |\ | * 53bfe41 vim/vint: show policy name (3 months ago) * 33202a3 #2107 - Recommend instead, which avoids autocmd functions (10 days ago) * 303bed6 #2107 - Document completion fallbacks and insert-completion trick (10 days ago) * 25b572b Close #3205 - Avoid inserting completions by default (10 days ago) * 6e2e51b Fix #2971 - Disable automatic completion while 'paste' is active (10 days ago) * 6888ca4 Fix retrying on some test failures (10 days ago) * f1ecc2e Fix psalm options. Retry on some test failures (10 days ago) * 7e0cdb5 Fix #3247 - Use --always-make for make -n by default (10 days ago) * bc3a843 Add a missing `augroup END` line (10 days ago) * 6b138b9 Merge pull request #3327 from Kimplul/master (10 days ago) |\ | * d9a7d6b Improved macro handling in gcc (10 days ago) |/ * 06264c2 typo (10 days ago) * dd9ad9b #3319 - Try to modify buffers later for ALEFix (10 days ago) * 7d4ce4e Close #3325 - Apply new formatting where possible (11 days ago) * 3d5a269 #3325 - ale#path#BufferCdString now generates %s:h (11 days ago) * 34e409e Close #3285 - lint_file is now dynamic (11 days ago) * b8c0ac2 Close #3309 - Add b:ale_lint_delay (11 days ago) * 6874120 Fix #3323 - Set default for g:ale_filename_mappings (11 days ago) * 36e959a Add sql-lint to supported tools (11 days ago) * 47fdc02 Merge pull request #2988 from joereynolds/master (11 days ago) |\ | * 0708006 Add sql-lint as linter (7 months ago) * 369e387 #3324 - Enable rls by default (11 days ago) * 80bd2e1 Set prettier working directory to where .prettierignore is (#3101) (11 days ago) * ecd7abe Fix #3319 - Force modifications to buffers (12 days ago) * 7545b18 Fix #3318 - Escape macros when parsing C flags (12 days ago) * 6d84371 Fix C flag parsing and tests on Windows (12 days ago) * 6074720 Mention --fast, and document running Windows tests locally (12 days ago) * af177d7 #3318 Refactor C flag parsing to set up for quoting arguments (12 days ago) * 719f3c6 #3266 - Catch echo visual selection errors (12 days ago) * 5d3d336 Merge pull request #3310 from pbrisbin/master (12 days ago) |\ | * 447aea4 Add dhall-format as a Fixer (2 weeks ago) * 571cff9 Label the test cases more clearly (12 days ago) * 1760577 Fix #3317 - Parse -include from C flags (12 days ago) * 66ff00c Fix #3316 - Repeat -relative for ALERepeatSelection (12 days ago) * f5aa0e8 Fix #3307 - Handle compile_commands paths better (12 days ago) * 686f42a Fix a typo (12 days ago) * c9377e9 #3314 - Tell people how to make new plug mappings (12 days ago) * a955f5d #3312 - Just check if additionalTextEdits is non-empty (12 days ago) * 396fba7 Fix #3312 - Fix a false positive for auto imports (12 days ago) - fzf: * e0f0b5b Update CHANGELOG (62 minutes ago) * 9e96073 [vim] Expose fzf#exec() function (66 minutes ago) * 0db65c2 [vim] Allow specifying popup width and height in absolute integer value (2 days ago) * d785135 [zsh] Fix the regular expression (#2140) (6 days ago) * ae15eda Add truecolor support for Windows, if available (#2156) (6 days ago) - vim-fugitive: * 511d303 Fix: digits in a user name was highlighted as time (13 days ago) - vim-graphql: * 94404d3 `vim-reasonml` is not necessary to be installed (#59) (25 hours ago) * 59ea49f Fix reason syntax (#60) (25 hours ago) * e64fba4 GraphQL indentation inside of JavaScript strings (8 days ago) - vim-haml: * 467d0ee Add sassKeyframe (#93) (13 days ago) - vim-markdown: * 276524e Mitigate performance issue with link text (12 hours ago) * a1ed888 Recognise indented bulleted lists for wrapping (4 days ago) - vim-ruby: * e367f7b Fix folding of comments in class definitions (11 days ago) + PlugUpgrade diff --git a/rcm/vim/autoload/plug.vim b/rcm/vim/autoload/plug.vim index 7914bfe..9262208 100644 --- a/rcm/vim/autoload/plug.vim +++ b/rcm/vim/autoload/plug.vim @@ -25,7 +25,7 @@ " Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' } " Plug 'tpope/vim-fireplace', { 'for': 'clojure' } " -" " Using a non-master branch +" " Using a non-default branch " Plug 'rdnetto/YCM-Generator', { 'branch': 'stable' } " " " Using a tagged release; wildcard allowed (requires git 1.9.2 or above) @@ -106,7 +106,7 @@ if s:is_win && &shellslash else let s:me = resolve(expand(':p')) endif -let s:base_spec = { 'branch': 'master', 'frozen': 0 } +let s:base_spec = { 'branch': '', 'frozen': 0 } let s:TYPE = { \ 'string': type(''), \ 'list': type([]), @@ -116,6 +116,90 @@ let s:TYPE = { let s:loaded = get(s:, 'loaded', {}) let s:triggers = get(s:, 'triggers', {}) +function! s:isabsolute(dir) abort + return a:dir =~# '^/' || (has('win32') && a:dir =~? '^\%(\\|[A-Z]:\)') +endfunction + +function! s:git_dir(dir) abort + let gitdir = s:trim(a:dir) . '/.git' + if isdirectory(gitdir) + return gitdir + endif + if !filereadable(gitdir) + return '' + endif + let gitdir = matchstr(get(readfile(gitdir), 0, ''), '^gitdir: \zs.*') + if len(gitdir) && !s:isabsolute(gitdir) + let gitdir = a:dir . '/' . gitdir + endif + return isdirectory(gitdir) ? gitdir : '' +endfunction + +function! s:git_origin_url(dir) abort + let gitdir = s:git_dir(a:dir) + let config = gitdir . '/config' + if empty(gitdir) || !filereadable(config) + return '' + endif + return matchstr(join(readfile(config)), '\[remote "origin"\].\{-}url\s*=\s*\zs\S*\ze') +endfunction + +function! s:git_revision(dir) abort + let gitdir = s:git_dir(a:dir) + let head = gitdir . '/HEAD' + if empty(gitdir) || !filereadable(head) + return '' + endif + + let line = get(readfile(head), 0, '') + let ref = matchstr(line, '^ref: \zs.*') + if empty(ref) + return line + endif + + if filereadable(gitdir . '/' . ref) + return get(readfile(gitdir . '/' . ref), 0, '') + endif + + if filereadable(gitdir . '/packed-refs') + for line in readfile(gitdir . '/packed-refs') + if line =~# ' ' . ref + return matchstr(line, '^[0-9a-f]*') + endif + endfor + endif + + return '' +endfunction + +function! s:git_local_branch(dir) abort + let gitdir = s:git_dir(a:dir) + let head = gitdir . '/HEAD' + if empty(gitdir) || !filereadable(head) + return '' + endif + let branch = matchstr(get(readfile(head), 0, ''), '^ref: refs/heads/\zs.*') + return len(branch) ? branch : 'HEAD' +endfunction + +function! s:git_origin_branch(spec) + if len(a:spec.branch) + return a:spec.branch + endif + + " The file may not be present if this is a local repository + let gitdir = s:git_dir(a:spec.dir) + let origin_head = gitdir.'/refs/remotes/origin/HEAD' + if len(gitdir) && filereadable(origin_head) + return matchstr(get(readfile(origin_head), 0, ''), + \ '^ref: refs/remotes/origin/\zs.*') + endif + + " The command may not return the name of a branch in detached HEAD state + let result = s:lines(s:system('git symbolic-ref --short HEAD', a:spec.dir)) + return v:shell_error ? '' : result[-1] +endfunction + if s:is_win function! s:plug_call(fn, ...) let shellslash = &shellslash @@ -646,25 +730,25 @@ function! s:parse_options(arg) endif let opts.tag = a:arg elseif type == s:TYPE.dict - call extend(opts, a:arg) for opt in ['branch', 'tag', 'commit', 'rtp', 'dir', 'as'] - if has_key(opts, opt) - \ && (type(opts[opt]) != s:TYPE.string || empty(opts[opt])) + if has_key(a:arg, opt) + \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) throw printf(opt_errfmt, opt, 'string') endif endfor for opt in ['on', 'for'] - if has_key(opts, opt) - \ && type(opts[opt]) != s:TYPE.list - \ && (type(opts[opt]) != s:TYPE.string || empty(opts[opt])) + if has_key(a:arg, opt) + \ && type(a:arg[opt]) != s:TYPE.list + \ && (type(a:arg[opt]) != s:TYPE.string || empty(a:arg[opt])) throw printf(opt_errfmt, opt, 'string or list') endif endfor - if has_key(opts, 'do') - \ && type(opts.do) != s:TYPE.funcref - \ && (type(opts.do) != s:TYPE.string || empty(opts.do)) + if has_key(a:arg, 'do') + \ && type(a:arg.do) != s:TYPE.funcref + \ && (type(a:arg.do) != s:TYPE.string || empty(a:arg.do)) throw printf(opt_errfmt, 'do', 'string or funcref') endif + call extend(opts, a:arg) if has_key(opts, 'dir') let opts.dir = s:dirpath(s:plug_expand(opts.dir)) endif @@ -991,8 +1075,8 @@ endfunction function! s:checkout(spec) let sha = a:spec.commit - let output = s:system(['git', 'rev-parse', 'HEAD'], a:spec.dir) - if !v:shell_error && !s:hash_match(sha, s:lines(output)[0]) + let output = s:git_revision(a:spec.dir) + if !empty(output) && !s:hash_match(sha, s:lines(output)[0]) let output = s:system( \ 'git fetch --depth 999999 && git checkout '.plug#shellescape(sha).' --', a:spec.dir) endif @@ -1206,7 +1290,7 @@ function! s:update_finish() call s:log4(name, 'Checking out '.tag) let out = s:system('git checkout -q '.plug#shellescape(tag).' -- 2>&1', spec.dir) else - let branch = get(spec, 'branch', 'master') + let branch = s:git_origin_branch(spec) call s:log4(name, 'Merging origin/'.s:esc(branch)) let out = s:system('git checkout -q '.plug#shellescape(branch).' -- 2>&1' \. (has_key(s:update.new, name) ? '' : ('&& git merge --ff-only '.plug#shellescape('origin/'.branch).' 2>&1')), spec.dir) @@ -2211,18 +2295,17 @@ endfunction function! s:git_validate(spec, check_branch) let err = '' if isdirectory(a:spec.dir) - let result = s:lines(s:system('git rev-parse --abbrev-ref HEAD 2>&1 && git config -f .git/config remote.origin.url', a:spec.dir)) + let result = [s:git_local_branch(a:spec.dir), s:git_origin_url(a:spec.dir)] let remote = result[-1] - if v:shell_error + if empty(remote) let err = join([remote, 'PlugClean required.'], "\n") elseif !s:compare_git_uri(remote, a:spec.uri) let err = join(['Invalid URI: '.remote, \ 'Expected: '.a:spec.uri, \ 'PlugClean required.'], "\n") elseif a:check_branch && has_key(a:spec, 'commit') - let result = s:lines(s:system('git rev-parse HEAD 2>&1', a:spec.dir)) - let sha = result[-1] - if v:shell_error + let sha = s:git_revision(a:spec.dir) + if empty(sha) let err = join(add(result, 'PlugClean required.'), "\n") elseif !s:hash_match(sha, a:spec.commit) let err = join([printf('Invalid HEAD (expected: %s, actual: %s)', @@ -2230,8 +2313,9 @@ function! s:git_validate(spec, check_branch) \ 'PlugUpdate required.'], "\n") endif elseif a:check_branch - let branch = result[0] + let current_branch = result[0] " Check tag + let origin_branch = s:git_origin_branch(a:spec) if has_key(a:spec, 'tag') let tag = s:system_chomp('git describe --exact-match --tags HEAD 2>&1', a:spec.dir) if a:spec.tag !=# tag && a:spec.tag !~ '\*' @@ -2239,14 +2323,14 @@ function! s:git_validate(spec, check_branch) \ (empty(tag) ? 'N/A' : tag), a:spec.tag) endif " Check branch - elseif a:spec.branch !=# branch + elseif origin_branch !=# current_branch let err = printf('Invalid branch: %s (expected: %s). Try PlugUpdate.', - \ branch, a:spec.branch) + \ current_branch, origin_branch) endif if empty(err) let [ahead, behind] = split(s:lastline(s:system([ \ 'git', 'rev-list', '--count', '--left-right', - \ printf('HEAD...origin/%s', a:spec.branch) + \ printf('HEAD...origin/%s', origin_branch) \ ], a:spec.dir)), '\t') if !v:shell_error && ahead if behind @@ -2254,11 +2338,11 @@ function! s:git_validate(spec, check_branch) " pushable (and probably not that messed up). let err = printf( \ "Diverged from origin/%s (%d commit(s) ahead and %d commit(s) behind!\n" - \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', a:spec.branch, ahead, behind) + \ .'Backup local changes and run PlugClean and PlugUpdate to reinstall it.', origin_branch, ahead, behind) else let err = printf("Ahead of origin/%s by %d commit(s).\n" \ .'Cannot update until local changes are pushed.', - \ a:spec.branch, ahead) + \ origin_branch, ahead) endif endif endif @@ -2588,20 +2672,23 @@ function! s:diff() endif call s:append_ul(2, origin ? 'Pending updates:' : 'Last update:') for [k, v] in plugs - let range = origin ? '..origin/'.v.branch : 'HEAD@{1}..' - let cmd = ['git', 'log', '--graph', '--color=never'] - if s:git_version_requirement(2, 10, 0) - call add(cmd, '--no-show-signature') - endif - call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range]) - if has_key(v, 'rtp') - call extend(cmd, ['--', v.rtp]) - endif - let diff = s:system_chomp(cmd, v.dir) - if !empty(diff) - let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' - call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) - let cnts[origin] += 1 + let branch = s:git_origin_branch(v) + if len(branch) + let range = origin ? '..origin/'.branch : 'HEAD@{1}..' + let cmd = ['git', 'log', '--graph', '--color=never'] + if s:git_version_requirement(2, 10, 0) + call add(cmd, '--no-show-signature') + endif + call extend(cmd, ['--pretty=format:%x01%h%x01%d%x01%s%x01%cr', range]) + if has_key(v, 'rtp') + call extend(cmd, ['--', v.rtp]) + endif + let diff = s:system_chomp(cmd, v.dir) + if !empty(diff) + let ref = has_key(v, 'tag') ? (' (tag: '.v.tag.')') : has_key(v, 'commit') ? (' '.v.commit) : '' + call append(5, extend(['', '- '.k.':'.ref], map(s:lines(diff), 's:format_git_log(v:val)'))) + let cnts[origin] += 1 + endif endif let bar .= '=' call s:progress_bar(2, bar, len(total)) @@ -2663,7 +2750,7 @@ function! s:snapshot(force, ...) abort let names = sort(keys(filter(copy(g:plugs), has_key(v:val, "uri") && !has_key(v:val, "commit") && isdirectory(v:val.dir)'))) for name in reverse(names) - let sha = s:system_chomp(['git', 'rev-parse', '--short', 'HEAD'], g:plugs[name].dir) + let sha = s:git_revision(g:plugs[name].dir) if !empty(sha) call append(anchor, printf("silent! let g:plugs['%s'].commit = '%s'", name, sha)) redraw + replug done ```