diff --git a/Brewfile-core b/Brewfile-core index fc6e602..f8cc318 100644 --- a/Brewfile-core +++ b/Brewfile-core @@ -5,15 +5,12 @@ tap 'buildpacks/tap' # Core utilities brew 'git' -brew 'lastpass-cli' brew 'wget' brew 'coreutils' brew 'direnv' # Core services brew 'docker', overwrite: true, link: true -brew 'mysql' -brew 'postgresql@9.6', restart_service: true, link: true # Kubernetes binaries brew 'kubernetes-cli' diff --git a/Brewfile-core.lock.json b/Brewfile-core.lock.json new file mode 100644 index 0000000..5c2a98d --- /dev/null +++ b/Brewfile-core.lock.json @@ -0,0 +1,391 @@ +{ + "entries": { + "tap": { + "cloudfoundry/tap": { + "revision": "cdb07f41f9bd72232615aa4b0c6e249724fc25f2" + }, + "k14s/tap": { + "revision": "cdc4206eee81f83bc79eb1c5486aa07844efdea2" + }, + "pivotal/tap": { + "revision": "5c66919d226e242bc04284d050c1664be498fb84" + }, + "buildpacks/tap": { + "revision": "bdd87f71af5d65caa7b9bb183450f3a28d284d50" + } + }, + "brew": { + "git": { + "version": "2.28.0_1", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/git-2.28.0_1.catalina.bottle.tar.gz", + "sha256": "6c4d10f29f78dcbefa12fab3e47e7755d5d2ca2e9bbc5aeee4838ad223296d0a" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/git-2.28.0_1.mojave.bottle.tar.gz", + "sha256": "10f23bc63568fdeb598df2dd30fbb0ead31f2eef3c0990a8ac53f3e2005de82f" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/git-2.28.0_1.high_sierra.bottle.tar.gz", + "sha256": "5095b064dfafb8cf4cabd017844f181d8eabaf45fb6965d2d30ed6de00c0e884" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/git-2.28.0_1.x86_64_linux.bottle.tar.gz", + "sha256": "b31c096a447ebba7a9cec3507e21ace0c0fdb570230b429f943039296099959a" + } + } + } + }, + "wget": { + "version": "1.20.3_2", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/wget-1.20.3_2.catalina.bottle.tar.gz", + "sha256": "ef65c759c5097a36323fa9c77756468649e8d1980a3a4e05695c05e39568967c" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/wget-1.20.3_2.mojave.bottle.tar.gz", + "sha256": "28f4090610946a4eb207df102d841de23ced0d06ba31cb79e040d883906dcd4f" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/wget-1.20.3_2.high_sierra.bottle.tar.gz", + "sha256": "91dd0caca9bd3f38c439d5a7b6f68440c4274945615fae035ff0a369264b8a2f" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/wget-1.20.3_2.x86_64_linux.bottle.tar.gz", + "sha256": "c6cd0e129ff133307530846f45280872d516b82bb5346f5193e1603f3b3dc34a" + } + } + } + }, + "coreutils": { + "version": "8.32", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/coreutils-8.32.catalina.bottle.1.tar.gz", + "sha256": "f40ba727ec1bb54300c7c79804f410a62341b63f3fba41d78ef34e5d369fe9fc" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/coreutils-8.32.mojave.bottle.1.tar.gz", + "sha256": "91cd269ea5eff54a3074e0c3cd0995911c5989a4eb87a3c27b17a765c48f494e" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/coreutils-8.32.high_sierra.bottle.1.tar.gz", + "sha256": "25c71d9d9a156cc8dfaa52b35dad1f9d49df55e97748fb5ab9522f65aeed4dca" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/coreutils-8.32.x86_64_linux.bottle.1.tar.gz", + "sha256": "36fd64482d0a2344d1ca2288e58739ee18e48f9b9e6b94d1c9ae47c870b9f05d" + } + } + } + }, + "direnv": { + "version": "2.23.0", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/direnv-2.23.0.catalina.bottle.tar.gz", + "sha256": "b5b5d510abe32133caad83648afc0950dcfbf9ea0ecdd305efe155817bff0b8b" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/direnv-2.23.0.mojave.bottle.tar.gz", + "sha256": "0339beb93dee2207dc3fdf9236a6a80bde6f6207dcfaee5f812d6700a8622f1f" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/direnv-2.23.0.high_sierra.bottle.tar.gz", + "sha256": "4f66782d86962cfec8c4383d8a0195eb4f8b3df44fc707f33eb5662e5aca76b9" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/direnv-2.23.0.x86_64_linux.bottle.tar.gz", + "sha256": "59fbbfcbe7e6fe7e20bce73a838f6e6e34e7caf504e07c53f8c3ad7e5f92da58" + } + } + } + }, + "docker": { + "version": "19.03.13", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/docker-19.03.13.catalina.bottle.tar.gz", + "sha256": "d71d12ae8813da24871221cdabba7d01a0a2f8af298e4eef5406a29a2af67482" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/docker-19.03.13.mojave.bottle.tar.gz", + "sha256": "f282bf99e388228269a531561efea176ca9abb46fc25ae6a4da739839a6850cb" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/docker-19.03.13.high_sierra.bottle.tar.gz", + "sha256": "ec61a354367c1226467664ee770e6665c5f0a8be041242e226233566b58ccad0" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/docker-19.03.13.x86_64_linux.bottle.tar.gz", + "sha256": "b710b48f9ccc84a7d66ae31cc18796cf07cf59732e2e148419fb4f4f4afc1a1e" + } + } + }, + "options": { + "overwrite": true, + "link": true + } + }, + "kubernetes-cli": { + "version": "1.19.3", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/kubernetes-cli-1.19.3.catalina.bottle.tar.gz", + "sha256": "f741a91d9fbcea6a40fbedbf0a63cdc8e9be3b39d13405d1d8507cc1b0f41e2f" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/kubernetes-cli-1.19.3.mojave.bottle.tar.gz", + "sha256": "0eea0ea0d9aaa807972692c47efd8525e22f9977dfba4b333e95fc10c41ce872" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/kubernetes-cli-1.19.3.high_sierra.bottle.tar.gz", + "sha256": "92567b1807bd2d656a2e63b53784a93170a058b5c4e5c308863bb49ab919c85a" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/kubernetes-cli-1.19.3.x86_64_linux.bottle.tar.gz", + "sha256": "770646bb0d315312c778718255192005a522de48b65e04182bbead2c00f37757" + } + } + } + }, + "bbr": { + "version": "1.8.0", + "bottle": false + }, + "cloudfoundry/tap/cf-cli@7": { + "options": { + "link": true, + "overwrite": true + } + }, + "cloudfoundry/tap/cf-cli@6": null, + "cloudfoundry/tap/bbl": null, + "cloudfoundry/tap/bosh-cli": null, + "cloudfoundry/tap/credhub-cli": null, + "ytt": { + "version": "v0.30.0", + "bottle": false + }, + "vendir": { + "version": "v0.11.0", + "bottle": false + }, + "kapp": { + "version": "v0.34.0", + "bottle": false + }, + "kbld": { + "version": "v0.25.0", + "bottle": false + }, + "buildpacks/tap/pack": null, + "go": { + "version": "1.15.3", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/go-1.15.3.catalina.bottle.tar.gz", + "sha256": "6bd0119a31c1ae26831105490a67b97bed5d0fd2c6ad140cdf4c84aa7a315af2" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/go-1.15.3.mojave.bottle.tar.gz", + "sha256": "6251ba0acffd00c58adb27bdeeb68213ec7723da54d83581272fa19f82a21137" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/go-1.15.3.high_sierra.bottle.tar.gz", + "sha256": "48df8ba509f14e4f28236fc74217233d62ab352a2f4db673c5081c163d92a35b" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/go-1.15.3.x86_64_linux.bottle.tar.gz", + "sha256": "83468d09a00b330fb8fe6ca5b29db47fcd38f30610592a2051697cdbd01abd2f" + } + } + } + }, + "ruby-install": { + "version": "0.7.1", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/ruby-install-0.7.1.catalina.bottle.tar.gz", + "sha256": "2c60a37228f97ef76c4f40c36b1a63d046a5d80acf5dc20d93183b81ccf1317a" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/ruby-install-0.7.1.mojave.bottle.tar.gz", + "sha256": "2c60a37228f97ef76c4f40c36b1a63d046a5d80acf5dc20d93183b81ccf1317a" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/ruby-install-0.7.1.high_sierra.bottle.tar.gz", + "sha256": "2c60a37228f97ef76c4f40c36b1a63d046a5d80acf5dc20d93183b81ccf1317a" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/ruby-install-0.7.1.x86_64_linux.bottle.tar.gz", + "sha256": "34a78042a7e8c9d65d32db5bc7fe6692188f81f1c8e4972ce1bd809908c9225e" + } + } + } + }, + "chruby": { + "version": "0.3.9", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.catalina.bottle.tar.gz", + "sha256": "004f825f798a41ffb3c9576aa3b77e7b8cef227287725818f5d3f1a779b12de6" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.mojave.bottle.tar.gz", + "sha256": "4b3e7d6e76cd5d914b0bb4871a0a0f33c9b997a9c579ca4450191c87c3dc4f53" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.high_sierra.bottle.tar.gz", + "sha256": "d59074fe39429eb9979acd0e81e6b9a142aa73595971cee42ab91bbe850c6105" + }, + "sierra": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.sierra.bottle.tar.gz", + "sha256": "17dc507695fed71749b5a58152d652bb7b92a4574f200b631a39f5f004e86cca" + }, + "el_capitan": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.el_capitan.bottle.tar.gz", + "sha256": "ff70dff83817f093d39384a40d3dfb2aaccc1cbe475d58383d4ef157085f2c64" + }, + "yosemite": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.yosemite.bottle.tar.gz", + "sha256": "eb14810c552b693c5ae82a577be81398e7dfeadc5489666bb0ff89581f09bfe4" + }, + "mavericks": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.mavericks.bottle.tar.gz", + "sha256": "c7ede5a22e512d3c22406f222b539fe05b78dfb9721cfff8ce94ed0357883ba5" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.x86_64_linux.bottle.tar.gz", + "sha256": "4c70e64524d054d86b15f623df44c800640b9b8ca8ee62b4ae4c4585a4ea48c8" + } + } + } + }, + "node@12": { + "version": "12.19.0_1", + "bottle": { + "cellar": ":any", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/node%4012-12.19.0_1.catalina.bottle.tar.gz", + "sha256": "daa9494f82ba99556e6a1ad9e230ec02c10e37eb1e41c67da699b886c9e2fc25" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/node%4012-12.19.0_1.mojave.bottle.tar.gz", + "sha256": "869917c95932d812c51cd45c5c77e9faadd9d94fbfc8b3858dea32659b9436f7" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/node%4012-12.19.0_1.high_sierra.bottle.tar.gz", + "sha256": "521f230437a6dcc79336dccfa12fb15f26286d6208a1384c9cd9517a6da09a60" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/node%4012-12.19.0_1.x86_64_linux.bottle.tar.gz", + "sha256": "8d60e36f7f627eee32c83385efa8d0129b298f291314a511f5049f41cb48ac95" + } + } + } + }, + "python": { + "options": { + "link": true, + "overwrite": true + } + }, + "shellcheck": { + "version": "0.7.1", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/shellcheck-0.7.1.catalina.bottle.1.tar.gz", + "sha256": "0cd635d2172d5e6617be8cdfb2723b6aa6feb2aa22e36cb3172d8b6fa012f4a0" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/shellcheck-0.7.1.mojave.bottle.1.tar.gz", + "sha256": "37201a49c0d7a5be49c5d97d4f6f8f5fcfef7d700b4694f74648a1addcd6783d" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/shellcheck-0.7.1.high_sierra.bottle.1.tar.gz", + "sha256": "1b20aeaba4d5e2e3df5cbe27636d655b6f877ee05a41d25fe1e0b3f9d00afa81" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/shellcheck-0.7.1.x86_64_linux.bottle.1.tar.gz", + "sha256": "be8fe95fce36b481265aeafcabe86776d010e10bcfac7f609d326ee6dcc409e7" + } + } + } + }, + "yarn": { + "version": "1.22.10", + "bottle": false + }, + "node": { + "version": "14.14.0", + "bottle": { + "cellar": ":any", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/node-14.14.0.catalina.bottle.tar.gz", + "sha256": "f1be3b305c38cc1a71cc089ec1f2983fa6b796f568aac3a6e4c93d79dc87661b" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/node-14.14.0.mojave.bottle.tar.gz", + "sha256": "ff29457f90b4dbf7164a3c8e1204321d3e37e33697006cab136b3e21a238fd02" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/node-14.14.0.high_sierra.bottle.tar.gz", + "sha256": "42b51e14448f7c4548effecd6f3f4c943785e122096b59ad8d4cb0b5c974faae" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/node-14.14.0.x86_64_linux.bottle.tar.gz", + "sha256": "4fb8b4fc89de3864e99192f39b329107e1c0d60c899505a60d965323003615e5" + } + } + } + } + } + }, + "system": { + "linux": { + "Ubuntu 18.04.5 LTS (bionic)": { + "HOMEBREW_VERSION": "2.5.6", + "HOMEBREW_PREFIX": "/home/linuxbrew/.linuxbrew", + "Homebrew/linuxbrew-core": "da914b70bfbc876ffcb44d91e5fe16e17c606cfc", + "GCC": "7.5.0" + } + } + } +} diff --git a/Brewfile-extra b/Brewfile-extra index 7e95fad..cf17961 100644 --- a/Brewfile-extra +++ b/Brewfile-extra @@ -2,19 +2,15 @@ tap 'businesscritical/tap' tap 'derailed/k9s' tap 'homebrew/cask-fonts' tap 'neovim/neovim' -tap 'universal-ctags/universal-ctags' brew 'ack' brew 'adr-tools' brew 'aria2' -brew 'autojump' brew 'awscli' brew 'bash' brew 'bash-completion' brew 'bat' brew 'bbr' -brew 'cf-cli' -brew 'cf7-cli' brew 'chruby' brew 'cloudfoundry/tap/bbl' brew 'cloudfoundry/tap/bosh-cli' @@ -24,9 +20,7 @@ brew 'derailed/k9s/k9s' brew 'dishy' brew 'fasd' brew 'fd' -brew 'git-author' brew 'git-secrets' -brew 'git-together' brew 'helm' brew 'httpie' brew 'ipcalc' @@ -35,8 +29,7 @@ brew 'minikube' brew 'neovim' brew 'proxychains-ng' brew 'pstree' -brew 'python-yq', link: true, overwrite: true -brew 'qt' +brew 'python-yq' brew 'ripgrep' brew 's3cmd' brew 'ssh-copy-id' @@ -44,7 +37,6 @@ brew 'tig' brew 'tldr' brew 'tmux' brew 'tree' -brew 'universal-ctags/universal-ctags/universal-ctags', args: ['HEAD'] brew 'watch' cask 'tuple' diff --git a/Brewfile-extra.lock.json b/Brewfile-extra.lock.json new file mode 100644 index 0000000..7a4d66f --- /dev/null +++ b/Brewfile-extra.lock.json @@ -0,0 +1,731 @@ +{ + "entries": { + "tap": { + "businesscritical/tap": { + "revision": "8300b675b7874276c42b7817f48177e74e997822" + }, + "derailed/k9s": { + "revision": "4829fe765962681840bf0b254a841e6a6ac0c218" + }, + "homebrew/cask-fonts": { + "revision": "3d3e2b10db004416134a508c4b1f6210bd203ca2" + }, + "neovim/neovim": { + "revision": "e587b5c90456a895a11bc5ae81e5cfdde6b23dd4" + } + }, + "brew": { + "ack": { + "version": "3.4.0", + "bottle": false + }, + "adr-tools": { + "version": "3.0.0", + "bottle": false + }, + "aria2": { + "version": "1.35.0_1", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/aria2-1.35.0_1.catalina.bottle.tar.gz", + "sha256": "9cc5e04be8b0a58d1f2b60b8abfc636168edbf23e7018003c40f1dd6952aab0c" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/aria2-1.35.0_1.mojave.bottle.tar.gz", + "sha256": "761836ac608eb0a59d4a6f6065860c0e809ce454692e0937d9d0d89ad47f3ce4" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/aria2-1.35.0_1.high_sierra.bottle.tar.gz", + "sha256": "70cc7566a23c283015368f92dfeaa0d119e53cfc7c1b2276a73ff9f6167b529d" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/aria2-1.35.0_1.x86_64_linux.bottle.tar.gz", + "sha256": "b183bb202db7c379f72320895fad71685b17d26d7f120f9306eb556e0cf0ddb7" + } + } + } + }, + "awscli": { + "version": "2.0.57", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/awscli-2.0.57.catalina.bottle.tar.gz", + "sha256": "a7f2553bf36b3138af2ea3861baa22224fbfbb88481182488e9cb23693dd5454" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/awscli-2.0.57.mojave.bottle.tar.gz", + "sha256": "ed83511bfb9f9e85ab295b501ea93bfbc78f238f7bb4ef3cfb6b37c4559590eb" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/awscli-2.0.57.high_sierra.bottle.tar.gz", + "sha256": "7be7a6cb59321f8ddf875dfe4574d6517a62d4517d25092ca1364a1a01a10693" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/awscli-2.0.57.x86_64_linux.bottle.tar.gz", + "sha256": "b3ddcf2c0b10a9ca0da7c33946f1ba26643ce591c3fd6f506ee3fb0992252cb6" + } + } + } + }, + "bash": { + "version": "5.0.18", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/bash-5.0.18.catalina.bottle.tar.gz", + "sha256": "c6e7b7a521a1cfb21f2872bde253bfd40150bd4ba36ada62c05fcdb73ae094c6" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/bash-5.0.18.mojave.bottle.tar.gz", + "sha256": "ba0617f6d3f4e691f9863e2f73596da94671f4c0ca21a95b99f19eced315f2d4" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/bash-5.0.18.high_sierra.bottle.tar.gz", + "sha256": "46023d0bafe68b838ada45ff6a66e63f7eac814eeb84e15a09d4b84a790ef49d" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/bash-5.0.18.x86_64_linux.bottle.tar.gz", + "sha256": "ca07ed480b79dd94e2c24f7a6ddc7ed9ff0ddf1591b8feeed9f38e1a54f2e78b" + } + } + } + }, + "bash-completion": { + "version": "1.3_3", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/bash-completion-1.3_3.catalina.bottle.tar.gz", + "sha256": "bd0c84cc6df9d3ff06ac081d85fdcc052b9e63136f4e2aa5fd2f2a0b7f654c84" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/bash-completion-1.3_3.mojave.bottle.tar.gz", + "sha256": "9219c2b46362677e9ae6e19b344b774c3e9f163ae6bf6cf2686da06419aaec89" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/bash-completion-1.3_3.high_sierra.bottle.tar.gz", + "sha256": "b069be5574bdf6d12fd1fda17c3162467b68165541166d95d1a9474653a63abc" + }, + "sierra": { + "url": "https://linuxbrew.bintray.com/bottles/bash-completion-1.3_3.sierra.bottle.tar.gz", + "sha256": "58be92ef01d5068f37b1c00af8e9b202bdb409c93121bb0e07dcbb5e55dc3be2" + }, + "el_capitan": { + "url": "https://linuxbrew.bintray.com/bottles/bash-completion-1.3_3.el_capitan.bottle.tar.gz", + "sha256": "58be92ef01d5068f37b1c00af8e9b202bdb409c93121bb0e07dcbb5e55dc3be2" + }, + "yosemite": { + "url": "https://linuxbrew.bintray.com/bottles/bash-completion-1.3_3.yosemite.bottle.tar.gz", + "sha256": "58be92ef01d5068f37b1c00af8e9b202bdb409c93121bb0e07dcbb5e55dc3be2" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/bash-completion-1.3_3.x86_64_linux.bottle.tar.gz", + "sha256": "d8e44d076970e70be1e5d910511f582857021c4e418db385f11be9d8ff354d1d" + } + } + } + }, + "bat": { + "version": "0.16.0", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/bat-0.16.0.catalina.bottle.1.tar.gz", + "sha256": "4bd522806fe7f6908245788ea041cf0eae32d012c883e57ad1ab137ca7d34fda" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/bat-0.16.0.mojave.bottle.1.tar.gz", + "sha256": "406537250c9d3c7ea2bfa64ff7cd102c86f9204a5cc731ebe5ce7c6f11e41320" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/bat-0.16.0.high_sierra.bottle.1.tar.gz", + "sha256": "10f22366b885e9a10d47f21de5c658dcb8189301cee8722974294a5451c0d80d" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/bat-0.16.0.x86_64_linux.bottle.1.tar.gz", + "sha256": "56b9772e122605cfcea996c8b56e2ab1dcc1e293a840211a62bebd360de189f8" + } + } + } + }, + "bbr": { + "version": "1.8.0", + "bottle": false + }, + "cf-cli": { + "version": "6.53.0", + "bottle": false + }, + "cf7-cli": null, + "chruby": { + "version": "0.3.9", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.catalina.bottle.tar.gz", + "sha256": "004f825f798a41ffb3c9576aa3b77e7b8cef227287725818f5d3f1a779b12de6" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.mojave.bottle.tar.gz", + "sha256": "4b3e7d6e76cd5d914b0bb4871a0a0f33c9b997a9c579ca4450191c87c3dc4f53" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.high_sierra.bottle.tar.gz", + "sha256": "d59074fe39429eb9979acd0e81e6b9a142aa73595971cee42ab91bbe850c6105" + }, + "sierra": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.sierra.bottle.tar.gz", + "sha256": "17dc507695fed71749b5a58152d652bb7b92a4574f200b631a39f5f004e86cca" + }, + "el_capitan": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.el_capitan.bottle.tar.gz", + "sha256": "ff70dff83817f093d39384a40d3dfb2aaccc1cbe475d58383d4ef157085f2c64" + }, + "yosemite": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.yosemite.bottle.tar.gz", + "sha256": "eb14810c552b693c5ae82a577be81398e7dfeadc5489666bb0ff89581f09bfe4" + }, + "mavericks": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.mavericks.bottle.tar.gz", + "sha256": "c7ede5a22e512d3c22406f222b539fe05b78dfb9721cfff8ce94ed0357883ba5" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/chruby-0.3.9.x86_64_linux.bottle.tar.gz", + "sha256": "4c70e64524d054d86b15f623df44c800640b9b8ca8ee62b4ae4c4585a4ea48c8" + } + } + } + }, + "cloudfoundry/tap/bbl": null, + "cloudfoundry/tap/bosh-cli": null, + "cloudfoundry/tap/credhub-cli": null, + "coreutils": { + "version": "8.32", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/coreutils-8.32.catalina.bottle.1.tar.gz", + "sha256": "f40ba727ec1bb54300c7c79804f410a62341b63f3fba41d78ef34e5d369fe9fc" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/coreutils-8.32.mojave.bottle.1.tar.gz", + "sha256": "91cd269ea5eff54a3074e0c3cd0995911c5989a4eb87a3c27b17a765c48f494e" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/coreutils-8.32.high_sierra.bottle.1.tar.gz", + "sha256": "25c71d9d9a156cc8dfaa52b35dad1f9d49df55e97748fb5ab9522f65aeed4dca" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/coreutils-8.32.x86_64_linux.bottle.1.tar.gz", + "sha256": "36fd64482d0a2344d1ca2288e58739ee18e48f9b9e6b94d1c9ae47c870b9f05d" + } + } + } + }, + "derailed/k9s/k9s": null, + "dishy": { + "version": "0.1.7", + "bottle": false + }, + "fasd": { + "version": "1.0.1", + "bottle": false + }, + "fd": { + "version": "8.1.1", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/fd-8.1.1.catalina.bottle.tar.gz", + "sha256": "4625e56da438b94dfe331a2fe1df759b140931241af097df91f29d8ac314f2d3" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/fd-8.1.1.mojave.bottle.tar.gz", + "sha256": "d002e8d8de192b6fad189ff7830d4fe9fc7d4ca9e81aa5ac66bb5200c590703a" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/fd-8.1.1.high_sierra.bottle.tar.gz", + "sha256": "c269bbc76090614e7262c81e1b21d784050a71a51a5921686845f0d3c0855400" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/fd-8.1.1.x86_64_linux.bottle.tar.gz", + "sha256": "253bd0d8662ebc8e176dea1db9863bb8b236b6c7e3909e77febcd7153c1c88f3" + } + } + } + }, + "git-author": { + "version": "1.1.0", + "bottle": false + }, + "git-secrets": { + "version": "1.3.0", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/git-secrets-1.3.0.catalina.bottle.tar.gz", + "sha256": "92ae3c8447754b1f5d23b5e7e3a601fca133f4b691b51b5004ffe17f4d763622" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/git-secrets-1.3.0.mojave.bottle.tar.gz", + "sha256": "d77761ee552d2963788f2bcab6c695d1b52f9d0c1d68dad65230901c750e63aa" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/git-secrets-1.3.0.high_sierra.bottle.tar.gz", + "sha256": "d77761ee552d2963788f2bcab6c695d1b52f9d0c1d68dad65230901c750e63aa" + }, + "sierra": { + "url": "https://linuxbrew.bintray.com/bottles/git-secrets-1.3.0.sierra.bottle.tar.gz", + "sha256": "fc2745b24be00e6b8e4b82d6768632810823ffff3f80ad99ca9943b31d003003" + } + } + } + }, + "git-together": { + "version": "0.1.0-alpha.24", + "bottle": false + }, + "helm": { + "version": "3.3.4", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/helm-3.3.4.catalina.bottle.tar.gz", + "sha256": "8ea831439125a0d31e243876dde7e30b6273e97adc6e45fd3f14cf8d097acb63" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/helm-3.3.4.mojave.bottle.tar.gz", + "sha256": "e5af6006990de1e44bdb0fa789cd92a4ad78a5f6726545a7ddae3a6f5da401b8" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/helm-3.3.4.high_sierra.bottle.tar.gz", + "sha256": "bb3bc2cdc2fa93491565d549579780248e84448a7b2a25bd13ac8d8f491bdde6" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/helm-3.3.4.x86_64_linux.bottle.tar.gz", + "sha256": "7b727d6ef2e4f3109e29b0d7bc4a95e1115f279da5a153d3549f5c9dbbcc5717" + } + } + } + }, + "httpie": { + "version": "2.2.0_1", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/httpie-2.2.0_1.catalina.bottle.tar.gz", + "sha256": "6956f918eabb4070d81f28f26d995056246179276d322d1929610f89733740f0" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/httpie-2.2.0_1.mojave.bottle.tar.gz", + "sha256": "772cd022ca55198ac20e90b510bbcd3e6d9adbeff81b6bf17d5063c1c2454b6c" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/httpie-2.2.0_1.high_sierra.bottle.tar.gz", + "sha256": "f792c4ee6183335d70e3c57d28326df0479e9de55b2ab0696d50aac051183b02" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/httpie-2.2.0_1.x86_64_linux.bottle.tar.gz", + "sha256": "931e19903d16c5632f3039dfb6c2135aa7421d88b1441e047d4d70aa143eae6d" + } + } + } + }, + "ipcalc": { + "version": "0.41", + "bottle": false + }, + "jq": { + "version": "1.6", + "bottle": { + "cellar": ":any", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/jq-1.6.catalina.bottle.1.tar.gz", + "sha256": "820a3c85fcbb63088b160c7edf125d7e55fc2c5c1d51569304499c9cc4b89ce8" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/jq-1.6.mojave.bottle.1.tar.gz", + "sha256": "71f0e76c5b22e5088426c971d5e795fe67abee7af6c2c4ae0cf4c0eb98ed21ff" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/jq-1.6.high_sierra.bottle.1.tar.gz", + "sha256": "dffcffa4ea13e8f0f2b45c5121e529077e135ae9a47254c32182231662ee9b72" + }, + "sierra": { + "url": "https://linuxbrew.bintray.com/bottles/jq-1.6.sierra.bottle.1.tar.gz", + "sha256": "bb4d19dc026c2d72c53eed78eaa0ab982e9fcad2cd2acc6d13e7a12ff658e877" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/jq-1.6.x86_64_linux.bottle.1.tar.gz", + "sha256": "d789e2534f6603eca9e5923c397e4f7e7a93856ad86bed2310f51b034e15f2a6" + } + } + } + }, + "minikube": { + "version": "1.14.0", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/minikube-1.14.0.catalina.bottle.tar.gz", + "sha256": "06468df343ad2b30e145885faf3e79ab992d6ee59bdabb2b9e6d20c467b746cb" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/minikube-1.14.0.mojave.bottle.tar.gz", + "sha256": "1a342c356293faeb55c61185554a4a34bb995a5e7fb5114f17db5a6534afb66e" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/minikube-1.14.0.high_sierra.bottle.tar.gz", + "sha256": "398159c00e76ba2a342b29d34318a86faa6524b4bff13226ac9a2db7820660ee" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/minikube-1.14.0.x86_64_linux.bottle.tar.gz", + "sha256": "bc8979790488db7d895befe52d209bc88fdc931d265e7747c22f543f3eeb8c6a" + } + } + } + }, + "neovim": { + "version": "0.4.4", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/neovim-0.4.4.catalina.bottle.tar.gz", + "sha256": "ade03fcf189ccd82e8b4627499113aed67a753b0e3ffa9662c15d7037f6ed617" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/neovim-0.4.4.mojave.bottle.tar.gz", + "sha256": "e68135735b24df7e1318bb71c4fef6461884b2c7a166d756b4a21bd787a329a2" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/neovim-0.4.4.high_sierra.bottle.tar.gz", + "sha256": "77773fc6e8ad7fd726e881850712f3995feef94548bfd6081599c5b682eb4411" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/neovim-0.4.4.x86_64_linux.bottle.tar.gz", + "sha256": "3a0ad323377edec8418c7864e8914b0c214e294369d6aadeb17e25d3e6176a53" + } + } + } + }, + "proxychains-ng": { + "version": "4.14", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/proxychains-ng-4.14.catalina.bottle.tar.gz", + "sha256": "1b8b781209633d9c4c45249b78865311e9853c36ba8522146a95cf4793d166b1" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/proxychains-ng-4.14.mojave.bottle.tar.gz", + "sha256": "4b41340fc2a68c579b3ab30affbe82f9be545537f727507d19977b1b67193a96" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/proxychains-ng-4.14.high_sierra.bottle.tar.gz", + "sha256": "42ba51b1578ff901987212d74e8b3a83ec6313f5ccfe3d554a9b32766f9b65c4" + }, + "sierra": { + "url": "https://linuxbrew.bintray.com/bottles/proxychains-ng-4.14.sierra.bottle.tar.gz", + "sha256": "4c8e8c69bd10529a33b3f70e1a55504f79e3358fe834d521c95adafb2f4eea4a" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/proxychains-ng-4.14.x86_64_linux.bottle.tar.gz", + "sha256": "1645137ebcd3fbc19c0ae8300075622be26ddd797aa289267e0ad1f1c6298be0" + } + } + } + }, + "pstree": { + "version": "2.39", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/pstree-2.39.catalina.bottle.2.tar.gz", + "sha256": "af4d6c7d6bffd6e12d3cb31ceb6bdd5292b66405ddd1be3a48870373829219a7" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/pstree-2.39.mojave.bottle.2.tar.gz", + "sha256": "27b643077e6fa2e233945f505b024f3e725ed8b930bdd89a9df73817197acbea" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/pstree-2.39.high_sierra.bottle.2.tar.gz", + "sha256": "426d5701e835bc1f9313c3b7cd630aa0f2b279ad5f95406bd73f50d174e8eaf1" + }, + "sierra": { + "url": "https://linuxbrew.bintray.com/bottles/pstree-2.39.sierra.bottle.2.tar.gz", + "sha256": "063d2498a346002265c44bf9ad237ae47fd9923a10dd529575640d7d63bef2fa" + }, + "el_capitan": { + "url": "https://linuxbrew.bintray.com/bottles/pstree-2.39.el_capitan.bottle.2.tar.gz", + "sha256": "624458274db8e826c170121061ad25547c5a245788c8108bd2bf0af4a3678dea" + }, + "yosemite": { + "url": "https://linuxbrew.bintray.com/bottles/pstree-2.39.yosemite.bottle.2.tar.gz", + "sha256": "127b605bf4b20cbddf63f875bd15f78ad5fc31eaebb57d9ce2051a3b856a8bd5" + }, + "mavericks": { + "url": "https://linuxbrew.bintray.com/bottles/pstree-2.39.mavericks.bottle.2.tar.gz", + "sha256": "2334d959beae2171fe10f6781a060eab40d57b841aa1905ead0b0936fb4145ef" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/pstree-2.39.x86_64_linux.bottle.2.tar.gz", + "sha256": "9011e38411f27f67cf2dfae4f42d74b17be5cbe8e77235bbb468ac4e29cda2d8" + } + } + } + }, + "python-yq": { + "version": "2.11.1_1", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/python-yq-2.11.1_1.catalina.bottle.tar.gz", + "sha256": "45289e8520aa9dced6210c1fa4baa69042f9d15ca49b89dc21659c6f49311df8" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/python-yq-2.11.1_1.mojave.bottle.tar.gz", + "sha256": "511b92444a1adc14910119fecb575d45bb2f4293309b9097cf66f6d610a98a23" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/python-yq-2.11.1_1.high_sierra.bottle.tar.gz", + "sha256": "629339b0b95e4d92e9f14122efd7d497738bab9355e4b9679db56b0dbbc29632" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/python-yq-2.11.1_1.x86_64_linux.bottle.tar.gz", + "sha256": "2025d8717fae8b0d1b0f34aa66e3a267dc258b528379e64ee8114dcae3c9e118" + } + } + } + }, + "ripgrep": { + "version": "12.1.1", + "bottle": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/ripgrep-12.1.1.catalina.bottle.tar.gz", + "sha256": "60460d422253113af3ed60332104f309638942821c655332211a6bc2213c472c" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/ripgrep-12.1.1.mojave.bottle.tar.gz", + "sha256": "de4b18789f5d9bc4aaa4d906501200ae4ece7a1971dd1b86e2b2d0a2c8e0d764" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/ripgrep-12.1.1.high_sierra.bottle.tar.gz", + "sha256": "cfea5335bf4eccfb7cd1d93bec234d96bd49dce8d593ea966687f777909ba291" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/ripgrep-12.1.1.x86_64_linux.bottle.tar.gz", + "sha256": "fe3b67bf15d9530bb7f33c33a3c3c5e6dc1ef93c283140620de55190af629a61" + } + } + } + }, + "s3cmd": { + "version": "2.1.0_1", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/s3cmd-2.1.0_1.catalina.bottle.tar.gz", + "sha256": "ea18ab2445955c20de54537447b5930de60cf8e927fe291f662760d50c0df8db" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/s3cmd-2.1.0_1.mojave.bottle.tar.gz", + "sha256": "737880ee8c7e9d73848eec50d87b1b7da7762a8b8d6172fd1f4be173888e18fe" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/s3cmd-2.1.0_1.high_sierra.bottle.tar.gz", + "sha256": "4d2c498462eba573c43413ec16f4681a8e604b67ff6739351900e500e2be5923" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/s3cmd-2.1.0_1.x86_64_linux.bottle.tar.gz", + "sha256": "d3fef12558ac96314fd0c28670b6c73e9a3877d92bfe89659ef0425f5edaa01f" + } + } + } + }, + "ssh-copy-id": { + "version": "8.3p1", + "bottle": false + }, + "tig": { + "version": "2.5.1", + "bottle": { + "cellar": ":any", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/tig-2.5.1.catalina.bottle.tar.gz", + "sha256": "e3dd84d1883ca04013d72311c248f623a3e55fa8fa31456f5fe956ae19ccd4de" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/tig-2.5.1.mojave.bottle.tar.gz", + "sha256": "0fbc0ae28aed58f73b1e798cbe75c8d131762c91371bd00e5a257c3a6fda7f85" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/tig-2.5.1.high_sierra.bottle.tar.gz", + "sha256": "9f6983f67cbbe6d551c8ab39131ca1e91e9f3e57ffe1f1791e6c182fd017fbf8" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/tig-2.5.1.x86_64_linux.bottle.tar.gz", + "sha256": "f5663bf7a9336264784c63ab82fd2ea7011df3718cf1e965f2cfe916ff3494d0" + } + } + } + }, + "tldr": { + "version": "1.3.0_2", + "bottle": { + "cellar": ":any", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/tldr-1.3.0_2.catalina.bottle.1.tar.gz", + "sha256": "41a6db2e28eeae00ff6d1888948d8b7d0f01cd67b3f271341b856cded07ba6ca" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/tldr-1.3.0_2.mojave.bottle.1.tar.gz", + "sha256": "7f10022d0c6648741457c2562bc5e521d8dd88dfc4c4d68d1c886739ffd7eb45" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/tldr-1.3.0_2.high_sierra.bottle.1.tar.gz", + "sha256": "c932bd8516b6690c45dcbf90ced6ad94d4a0aa5a366de532fe90c4ab82b9a2ad" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/tldr-1.3.0_2.x86_64_linux.bottle.1.tar.gz", + "sha256": "5783e97f5eca1bd13f00c7bbce75db77d8340f677d1344aaa0aa7d4547035d41" + } + } + } + }, + "tmux": { + "version": "3.1b", + "bottle": { + "cellar": ":any", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/tmux-3.1b.catalina.bottle.1.tar.gz", + "sha256": "785c1b2e2518478621eb5ac894b3f0ed06d8fdc4d223dd476451ab26974e3803" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/tmux-3.1b.mojave.bottle.1.tar.gz", + "sha256": "a8fb2df02c2e094404b6c56e2b9d15a35abd012913771ad311e08cc3572f0e4b" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/tmux-3.1b.high_sierra.bottle.1.tar.gz", + "sha256": "5d43e03fc71740ec38c98b309adb2b6d198a20fcb14f76bc163232fda61fac23" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/tmux-3.1b.x86_64_linux.bottle.1.tar.gz", + "sha256": "220223f0a48574966d99fbd4e39665ffd7304da72e4a4c4a32f4f7d096ca0aa7" + } + } + } + }, + "tree": { + "version": "1.8.0", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/tree-1.8.0.catalina.bottle.tar.gz", + "sha256": "18f7984bdbab22251e9fc3c7832dbace5c7f7a77e8d63717bb0078385e2bf255" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/tree-1.8.0.mojave.bottle.tar.gz", + "sha256": "7152288c457dd893de50fa9d6ac9a8599748564e1b3586eec8eff7057089051a" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/tree-1.8.0.high_sierra.bottle.tar.gz", + "sha256": "107d965994381d34e90b58a62f1c306c1b8a698db2696cdd905ba65c801ecc3b" + }, + "sierra": { + "url": "https://linuxbrew.bintray.com/bottles/tree-1.8.0.sierra.bottle.tar.gz", + "sha256": "07d980571469a0cc699c69a8726eee338f782ba61c041e58f01ddb2924d08aeb" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/tree-1.8.0.x86_64_linux.bottle.tar.gz", + "sha256": "3d8879638ad61487220090225bff52e1f5a4332e75b4b699bb85bccc9921193b" + } + } + } + }, + "watch": { + "version": "3.3.16", + "bottle": { + "cellar": ":any_skip_relocation", + "prefix": "/home/linuxbrew/.linuxbrew", + "files": { + "catalina": { + "url": "https://linuxbrew.bintray.com/bottles/watch-3.3.16.catalina.bottle.tar.gz", + "sha256": "011e48363fe62c7a4ba0dec746d5964ee25545bde7855a31db0cb411420df190" + }, + "mojave": { + "url": "https://linuxbrew.bintray.com/bottles/watch-3.3.16.mojave.bottle.tar.gz", + "sha256": "d17aba6f80c530e6b91b30e088df60aab3dc84b2f57ca7499928322438b9f0d2" + }, + "high_sierra": { + "url": "https://linuxbrew.bintray.com/bottles/watch-3.3.16.high_sierra.bottle.tar.gz", + "sha256": "13d63ebc419965182d98f10b25cc99961679e1ba5ce6118e66b7037eb4e78de8" + }, + "x86_64_linux": { + "url": "https://linuxbrew.bintray.com/bottles/watch-3.3.16.x86_64_linux.bottle.tar.gz", + "sha256": "5e354a0971729694c7d641fcde59ae6f63788e004b1557a13dd5db8f204788de" + } + } + } + } + } + }, + "system": { + "linux": { + "Ubuntu 18.04.5 LTS (bionic)": { + "HOMEBREW_VERSION": "2.5.6", + "HOMEBREW_PREFIX": "/home/linuxbrew/.linuxbrew", + "Homebrew/linuxbrew-core": "086887c33ac45bceadf6eca3dd3c3bb6afbe4500", + "GCC": "7.5.0" + } + } + } +} diff --git a/Brewfile-osx b/Brewfile-osx new file mode 100644 index 0000000..df706e1 --- /dev/null +++ b/Brewfile-osx @@ -0,0 +1,14 @@ +#TODO: move the following to be extra-only install? +tap 'universal-ctags/universal-ctags' +brew 'git-author' +brew 'git-together' +brew 'lastpass-cli' + + + +brew 'mysql' +brew 'docker', overwrite: true, link: true +brew 'postgresql@9.6', restart_service: true, link: true +brew 'autojump' + +brew 'universal-ctags/universal-ctags/universal-ctags', args: ['HEAD'] diff --git a/bash-it/vat-ws.bash b/bash-it/vat-ws.bash index abfc1b4..9c0cb89 100644 --- a/bash-it/vat-ws.bash +++ b/bash-it/vat-ws.bash @@ -2,5 +2,7 @@ alias vat-ws-1='gcloud beta compute ssh --zone "us-central1-a" "pivotal@vat-ws-1 alias vat-ws-2='gcloud beta compute ssh --zone "us-central1-a" "pivotal@vat-ws-2" --project "cf-cli" --ssh-flag="-A"' alias vat-ws-3='gcloud beta compute ssh --zone "us-west1-b" "pivotal@vat-ws-3" --project "cf-cli" --ssh-flag="-A"' alias vat-ws-4='gcloud beta compute ssh --zone "us-central1-a" "pivotal@vat-ws-4" --project "cf-cli" --ssh-flag="-A"' - + alias capi-ws-1='gcloud beta compute ssh --zone "us-central1-a" "pivotal@capi-ws-1" --project "cf-capi-arya" --ssh-flag="-A"' +alias capi-ws-2='gcloud beta compute ssh --zone "us-central1-a" "pivotal@capi-ws-2" --project "cf-capi-arya" --ssh-flag="-A"' +alias capi-ws-3='gcloud beta compute ssh --zone "us-central1-a" "pivotal@capi-ws-3" --project "cf-capi-arya" --ssh-flag="-A"' diff --git a/bin/print_env_info b/bin/print_env_info index 3df30d2..42e518a 100755 --- a/bin/print_env_info +++ b/bin/print_env_info @@ -1,4 +1,4 @@ -#!/usr/bin/env sh +#!/bin/bash set -e pushd ~/workspace/capi-env-pool > /dev/null diff --git a/bin/story b/bin/story index 49f1aec..a200b0d 100755 --- a/bin/story +++ b/bin/story @@ -3,7 +3,7 @@ get_stories() { story_json="$(curl -s -H "Content-Type: application/json" \ - "https://www.pivotaltracker.com/services/v5/projects/$project_id/stories?with_state=started" | tr '**' ' ')" + "https://www.pivotaltracker.com/services/v5/projects/$CAPI_WORKSPACE_TRACKER_ID/stories?with_state=started" | tr '**' ' ')" echo $story_json | tr '\n' ' ' | jq '.[] | "#\(.id) \(.name)"' echo "No story" } @@ -21,8 +21,29 @@ story_selector() { IFS=$OLD_IFS } +backlog_selector() { + backlogs=("CAPI 966314" "VAT 2196383" "CAKE 2468497") + + PS3="Select a backlog or 'q' to quit: " + OLD_IFS=$IFS + IFS=$'\n' + select backlog in "${backlogs[@]}"; do + echo "$backlog" + break + done + IFS=$OLD_IFS +} + story() { - project_id=2468497; + if [ -z "$CAPI_WORKSPACE_TRACKER_ID" ]; then + backlog_selection="$(backlog_selector)" + CAPI_WORKSPACE_TRACKER_ID="$(echo "$backlog_selection" | awk '{print $2;}')" + fi + + if [ -z "$CAPI_WORKSPACE_TRACKER_ID" ]; then + echo "No backlog selected. Exiting..." + return + fi story_selection="$(story_selector)" story_id="$(echo "$story_selection" | awk '{print $1;}' | sed s/\"//)" @@ -33,8 +54,13 @@ story() { return fi - STORY_TITLE="$(curl -s "https://www.pivotaltracker.com/services/v5/projects/${project_id}/stories/${story_id}" | jq -r .name)"; - STORY_URL="$(curl -s "https://www.pivotaltracker.com/services/v5/projects/${project_id}/stories/${story_id}" | jq -r .url)"; + if [ -z "$story_selection" ]; then + echo "No story selected. Exiting..." + return + fi + + STORY_TITLE="$(curl -s "https://www.pivotaltracker.com/services/v5/projects/${CAPI_WORKSPACE_TRACKER_ID}/stories/${story_id}" | jq -r .name)"; + STORY_URL="$(curl -s "https://www.pivotaltracker.com/services/v5/projects/${CAPI_WORKSPACE_TRACKER_ID}/stories/${story_id}" | jq -r .url)"; export STORY_NUM="#${story_id} [${STORY_TITLE}](${STORY_URL})" diff --git a/install-core.sh b/install-core.sh index 278d10b..276f692 100755 --- a/install-core.sh +++ b/install-core.sh @@ -13,15 +13,25 @@ : "${FULL_CAPI_INSTALL:=false}" +if [ "$(uname)" = "Darwin" ]; then + IS_OSX=true +else + IS_OSX=false + ./install-scripts/ubuntu.sh +fi # install brew and its packages source ./install-scripts/brew.sh -source ./install-scripts/xcode.sh +if [ "$IS_OSX" = true ]; then + source ./install-scripts/xcode.sh +else + echo "Skipping Xcode installation for non OSX install" +fi source ./install-scripts/brew-bundle.sh - +echo "Installing ruby" # ruby setup source ./install-scripts/ruby.sh source ./install-scripts/bundler.sh - +echo "Installing databases" # daemons to launch databases at startup source ./install-scripts/mysql.sh source ./install-scripts/postgres.sh @@ -33,4 +43,4 @@ source ./install-scripts/go.sh source ./install-scripts/clone-repos.sh # Concourse "fly" -source ./install-scripts/fly.sh \ No newline at end of file +source ./install-scripts/fly.sh diff --git a/install-scripts/bash.sh b/install-scripts/bash.sh index 830f06a..b01c00c 100755 --- a/install-scripts/bash.sh +++ b/install-scripts/bash.sh @@ -5,4 +5,5 @@ fi # use homebrew-provided, updated bash echo /usr/local/bin/bash | sudo tee -a /etc/shells -chsh -s /usr/local/bin/bash +sudo chsh -s /usr/local/bin/bash + diff --git a/install-scripts/brew-bundle.sh b/install-scripts/brew-bundle.sh index 2377ccf..12ef35a 100755 --- a/install-scripts/brew-bundle.sh +++ b/install-scripts/brew-bundle.sh @@ -6,6 +6,8 @@ set -e core_capi_brewfile="${PWD}/Brewfile-core" extra_capi_brewfile="${PWD}/Brewfile-extra" +osx_capi_brewfile="${PWD}/Brewfile-osx" + echo "Installing from the Brewfile..." brew update || echo "brew update failed, but continuing" brew tap Homebrew/bundle @@ -13,8 +15,19 @@ if ! brew bundle check --file "$core_capi_brewfile"; then brew bundle --file "$core_capi_brewfile" fi +if [ "$(uname)" = "Darwin" ]; then + echo "Trying to install OSX forumalas" + + if ! brew bundle check --file "$osx_capi_brewfile"; then + echo "Installing OSX specific Brew formulas" + brew bundle --file "$osx_capi_brewfile" + fi +fi + if [ "$FULL_CAPI_INSTALL" = true ]; then if ! brew bundle check --file "$extra_capi_brewfile"; then brew bundle --file "$extra_capi_brewfile" fi fi + +source "${PWD}/install-scripts/brew-cf-cli.sh" diff --git a/install-scripts/brew-cf-cli.sh b/install-scripts/brew-cf-cli.sh new file mode 100755 index 0000000..a384d58 --- /dev/null +++ b/install-scripts/brew-cf-cli.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# both versions of cf-cli conflict on trying to link `cf`, +# which can cause the install via Brewfile to fail + +brew install cf-cli@7 + +# this will exit 1 since v7 already has the link +brew install cf-cli@6 +cli6_version="$(brew list --versions | grep cf-cli@6 | cut -d' ' -f2)" +sudo ln -snf "$(brew --cellar cf-cli@6)/$cli6_version/bin/cf" /usr/local/bin/cf6 diff --git a/install-scripts/brew.sh b/install-scripts/brew.sh index 7f0105e..064e09e 100755 --- a/install-scripts/brew.sh +++ b/install-scripts/brew.sh @@ -12,6 +12,12 @@ function install_brew { # to avoid ttyless complaints on brew update sudo mkdir -p /usr/local/sbin sudo chown -R $(whoami) /usr/local/sbin + if [ "$(uname)" = "Linux" ]; then + if ! brew; then + echo 'eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv)' >> /home/pivotal/.profile + eval $(/home/linuxbrew/.linuxbrew/bin/brew shellenv) + fi + fi } # do not run in non-interactive contexts diff --git a/install-scripts/clone-repos.sh b/install-scripts/clone-repos.sh index 45b427c..fc00e3c 100755 --- a/install-scripts/clone-repos.sh +++ b/install-scripts/clone-repos.sh @@ -28,14 +28,13 @@ EOT } pushd ~/workspace > /dev/null - clone git@github.com:pivotal/pivotal_ide_prefs.git ~/workspace/pivotal_ide_prefs clone git@github.com:cloudfoundry/capi-release.git ~/workspace/capi-release develop clone git@github.com:cloudfoundry/capi-env-pool.git ~/workspace/capi-env-pool clone git@github.com:cloudfoundry/capi-ci.git ~/workspace/capi-ci clone git@github.com:cloudfoundry/capi-dockerfiles.git ~/workspace/capi-dockerfiles clone git@github.com:cloudfoundry/capi-ci-private.git ~/workspace/capi-ci-private clone git@github.com:cloudfoundry/cf-deployment.git ~/workspace/cf-deployment - clone git@github.com:cloudfoundry/cf-for-k8s.git ~/workspace/cf-for-k8s + clone git@github.com:cloudfoundry/cf-for-k8s.git ~/workspace/cf-for-k8s main clone git@github.com:cloudfoundry/cf-acceptance-tests.git ~/go/src/github.com/cloudfoundry/cf-acceptance-tests clone git@github.com:cloudfoundry/sync-integration-tests.git ~/go/src/code.cloudfoundry.org/sync-integration-tests clone git@github.com:cloudfoundry/capi-bara-tests.git ~/go/src/github.com/cloudfoundry/capi-bara-tests diff --git a/install-scripts/fly.sh b/install-scripts/fly.sh index 5d9dcd6..6672f03 100755 --- a/install-scripts/fly.sh +++ b/install-scripts/fly.sh @@ -4,6 +4,11 @@ set -e if ! which fly > /dev/null ; then destination=/usr/local/bin/fly - wget "https://capi.ci.cf-app.com/api/v1/cli?arch=amd64&platform=darwin" -O $destination - chmod +x $destination + if [ "$(uname)" = "Darwin" ]; then + wget "https://capi.ci.cf-app.com/api/v1/cli?arch=amd64&platform=darwin" -O $destination + chmod +x $destination + else + sudo wget "https://capi.ci.cf-app.com/api/v1/cli?arch=amd64&platform=linux" -O $destination + sudo chmod +x $destination + fi fi diff --git a/install-scripts/git-author-linux.sh b/install-scripts/git-author-linux.sh new file mode 100755 index 0000000..60277de --- /dev/null +++ b/install-scripts/git-author-linux.sh @@ -0,0 +1,20 @@ +#!/bin/bash + + +# git-together on linuxbrew is broken, so we install it ourselves + +# Install credhub cli +REMAINING=$(curl https://api.github.com/rate_limit 2>/dev/null | jq '.rate.remaining') +if [[ $REMAINING -eq 0 ]]; then + echo "**NOT** Installing latest git-together" + echo "We hit the rate limit for the 'api.github.com' and cannot download the latest git-together Release." + echo "Reference: https://developer.github.com/v3/#rate-limiting" + echo +else + echo "Installing latest git-together" + git_together_url="$(curl https://api.github.com/repos/kejadlen/git-together/releases | jq '.[0].assets | map(select(.name | contains("linux"))) | .[0].browser_download_url' -r)" + curl -Lo /tmp/git_together.tgz "$git_together_url" + sudo tar xzvf /tmp/git_together.tgz -C /usr/local/bin + + brew install git-author +fi diff --git a/install-scripts/git-hooks.sh b/install-scripts/git-hooks.sh index 18691c4..1d51fab 100755 --- a/install-scripts/git-hooks.sh +++ b/install-scripts/git-hooks.sh @@ -10,7 +10,7 @@ if [ ! -d ~/workspace/git-hooks-core ]; then curl -o cred-alert-cli \ https://s3.amazonaws.com/cred-alert/cli/current-release/cred-alert-cli_${os_name} chmod 755 cred-alert-cli - mv cred-alert-cli /usr/local/bin # <= or other directory in ${PATH} + sudo mv cred-alert-cli /usr/local/bin # clone our branch of git-hooks-core @ team/capi branch git clone -b "team/capi" https://github.com/pivotal-cf/git-hooks-core ~/workspace/git-hooks-core diff --git a/install-scripts/go.sh b/install-scripts/go.sh index 5569932..824d2ff 100755 --- a/install-scripts/go.sh +++ b/install-scripts/go.sh @@ -27,11 +27,6 @@ for gopkg in "${GO_UTILS[@]}"; do done if ! which golangci-lint 2>&1 > /dev/null ; then - version_name=$(curl -s https://api.github.com/repos/golangci/golangci-lint/releases/latest | jq -r .name) - if [[ -z "$version_name" ]] ; then - echo "Can't get the golangci github repo latest release info" - else - curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | - sh -s -- -b $(go env GOPATH)/bin $version_name - fi + curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | + sh -s -- -b $(go env GOPATH)/bin fi diff --git a/install-scripts/misc.sh b/install-scripts/misc.sh index 8519793..826f46f 100755 --- a/install-scripts/misc.sh +++ b/install-scripts/misc.sh @@ -7,5 +7,5 @@ TARGET=/usr/local/bin SOURCE=$HOME/workspace/capi-release/scripts # notice this NOT capi-workspace, if you are adding content to this file (REFACTOR!) if [ ! -h $TARGET/fixcommitter ] && [ ! -f $TARGET/fixcommitter ]; then - ln -s $SOURCE/fixcommitter $TARGET/fixcommitter + sudo ln -s $SOURCE/fixcommitter $TARGET/fixcommitter fi diff --git a/install-scripts/mysql.sh b/install-scripts/mysql.sh index 86d8b4c..31d5468 100755 --- a/install-scripts/mysql.sh +++ b/install-scripts/mysql.sh @@ -3,21 +3,43 @@ set -e MYSQL_PASSWORD="${MYSQL_PASSWORD:-password}" -brew services restart mysql +if [ "$(uname)" = "Darwin" ]; then + brew services restart mysql + # Is mysql running? + for i in $(seq 60); do + if mysql -uroot -p"$MYSQL_PASSWORD" -e 'show databases' > /dev/null 2>&1; then + echo "MySQL is running" + break + else + sleep 1 + fi + done -# Is mysql running? -for i in $(seq 60); do - if mysql -uroot -p"$MYSQL_PASSWORD" -e 'show databases' > /dev/null 2>&1; then - break + # Change the admin password + if ! mysql -uroot -p"$MYSQL_PASSWORD" -e 'show databases' > /dev/null 2>&1; then + echo "Setting MySQL admin password" + mysqladmin -uroot password password else - sleep 1 + echo "MySQL admin password already set" fi -done - -# Change the admin password -if ! mysql -uroot -p"$MYSQL_PASSWORD" -e 'show databases' > /dev/null 2>&1; then - echo "Setting MySQL admin password" - mysqladmin -uroot password password else - echo "MySQL admin password already set" + sudo service mysql start + # Is mysql running? + for i in $(seq 60); do + if sudo service mysql status; then + echo "MySQL is running" + break + else + sleep 1 + fi + done + + # Change the admin password + if ! mysql -uroot -p"$MYSQL_PASSWORD" -e 'show databases' > /dev/null 2>&1; then + echo "Setting MySQL admin password" + sudo mysql -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY '$MYSQL_PASSWORD';" + else + echo "MySQL admin password already set" + fi fi + diff --git a/install-scripts/postgres.sh b/install-scripts/postgres.sh index ea53284..895a857 100755 --- a/install-scripts/postgres.sh +++ b/install-scripts/postgres.sh @@ -1,22 +1,31 @@ #!/bin/bash set -e -brew link postgresql@9.6 --force -brew services start postgresql@9.6 +if [ "$(uname)" = "Darwin" ]; then -# Is postgres running? -for i in $(seq 60); do - if brew services list | grep postgresql | grep -q started; then - break + brew link postgresql@9.6 --force + brew services start postgresql@9.6 + + # Is postgres running? + for i in $(seq 60); do + if brew services list | grep postgresql | grep -q started; then + break + else + sleep 1 + fi + done + + # Change the admin password + # How does this actually change the password? + if ! psql -U postgres -c "select 1" &> /dev/null; then + echo "Setting postgres user" + createuser -U "$(whoami)" --superuser postgres else - sleep 1 + echo "postgres user already created" fi -done - -# Change the admin password -if ! psql -U postgres -c "select 1" &> /dev/null; then - echo "Setting postgres user" - createuser -U "$(whoami)" --superuser postgres else - echo "postgres user already created" + sudo service postgresql start + fi + + diff --git a/install-scripts/ruby.sh b/install-scripts/ruby.sh index 058389c..822b108 100755 --- a/install-scripts/ruby.sh +++ b/install-scripts/ruby.sh @@ -2,7 +2,7 @@ set -e -source /usr/local/share/chruby/chruby.sh +source "$(brew --prefix)/share/chruby/chruby.sh" RUBY_VERSION="2.5.5" @@ -18,5 +18,5 @@ ruby -e 'if (`gem --version`.chomp.split(".").map(&:to_i) <=> [2, 6, 14]) == -1 system("gem update --system 2.6.14") \ end' -source /usr/local/share/chruby/chruby.sh +source "$(brew --prefix)/share/chruby/chruby.sh" chruby ${RUBY_VERSION} diff --git a/install-scripts/ubuntu.sh b/install-scripts/ubuntu.sh new file mode 100755 index 0000000..6f3258e --- /dev/null +++ b/install-scripts/ubuntu.sh @@ -0,0 +1,38 @@ +#!/bin/bash +echo "Updating apt packages" +sudo apt update +echo "Upgrading Linux distribution" +sudo apt dist-upgrade -y + +sudo apt install -y \ + python-pip \ + python-setuptools \ + mysql-server \ + postgresql \ + ruby \ + ruby-bundler +# install linux only dependencies here +# Install lastpass-cli from source (the Ubuntu package is broken) +echo "Installing lastpass-cli from source" +if [[ ! -d ~/workspace/lastpass-cli ]]; then + pushd ~/workspace + git clone https://github.com/lastpass/lastpass-cli.git + popd +fi + +# linuxbrew doesn't install git stuff where we expect it to +sudo ln -s /home/linuxbrew/.linuxbrew/share/git-core /usr/local/share/git-core + +pushd ~/workspace/lastpass-cli + sudo apt install -y openssl libcurl4-openssl-dev libxml2 libssl-dev libxml2-dev pinentry-curses xclip cmake build-essential pkg-config + git pull + cmake . + make + sudo make install +popd + +# .config directory is required by lastpass-cli +mkdir -p "${HOME}/.config" +mkdir -p "${HOME}/.local/share/lpass" +#sudo apt install universal-ctags + diff --git a/install-scripts/update-cred-alert.sh b/install-scripts/update-cred-alert.sh index ae3fd96..c43845a 100755 --- a/install-scripts/update-cred-alert.sh +++ b/install-scripts/update-cred-alert.sh @@ -2,4 +2,4 @@ set -e -cred-alert-cli update +sudo cred-alert-cli update diff --git a/install-scripts/vim.sh b/install-scripts/vim.sh index ad7e0af..de7303e 100755 --- a/install-scripts/vim.sh +++ b/install-scripts/vim.sh @@ -6,11 +6,10 @@ grep -q "github.com/luan/nvim" ~/.config/nvim/.git/config || git clone https://github.com/luan/nvim ~/.config/nvim) echo "Install python-client for neovim..." -pip install --upgrade neovim -pip install --upgrade pynvim +python3 -m pip install --user --upgrade pynvim echo "Add yamllint for neomake..." -pip install -q yamllint +pip3 install -q yamllint mkdir -p ~/.config/nvim/user pushd ~/.config/nvim/user diff --git a/install.sh b/install.sh index 9518a36..042c8d2 100755 --- a/install.sh +++ b/install.sh @@ -22,7 +22,6 @@ source ./install-core.sh # bash-it / terminal source ./install-scripts/bash.sh source ./install-scripts/bash-it.sh -source ./install-scripts/iterm2.sh source ./install-scripts/vim.sh source ./install-scripts/tmux.sh @@ -34,12 +33,16 @@ source ./install-scripts/git-author.sh # update cred-alert-cli source ./install-scripts/update-cred-alert.sh -# ide prefs -source ./install-scripts/ide-prefs.sh - -source ./install-scripts/keyboard.sh -source ./install-scripts/dock.sh -source ./install-scripts/spectacle.sh +if [ "$(uname)" = "Darwin" ]; then + echo "Installing OSX only scripts" + source ./install-scripts/ide-prefs.sh + source ./install-scripts/iterm2.sh + source ./install-scripts/keyboard.sh + source ./install-scripts/dock.sh + source ./install-scripts/spectacle.sh +else + source ./install-scripts/git-author-linux.sh +fi source ./install-scripts/misc.sh diff --git a/lib/claim-bosh-lite.bash b/lib/claim-bosh-lite.bash index bdc928f..d2acf68 100755 --- a/lib/claim-bosh-lite.bash +++ b/lib/claim-bosh-lite.bash @@ -1,5 +1,6 @@ env_pool="$HOME/workspace/capi-env-pool" +# TODO: have this script choose Tracker ID like our "story" script project_id=966314; function get_stories() { @@ -7,7 +8,6 @@ function get_stories() { "https://www.pivotaltracker.com/services/v5/projects/$project_id/stories?with_state=started" | tr '**' ' ')" echo $story_json | tr '\n' ' ' | jq -r '.[] | "#\(.id) \(.name)"' echo "No story" - } function story_selector() { diff --git a/lib/deploy_only_new_capi.bash b/lib/deploy_only_new_capi.bash deleted file mode 100644 index e69de29..0000000