Skip to content

Commit e59ee6b

Browse files
committed
Fixed go vars, bumped ruby to 3.1, fixed vimrc install
1 parent 16336eb commit e59ee6b

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

jobs/jumpbox/templates/config/bashrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ fi
1717
################################################################################
1818
##################################################### env vars you get for free
1919

20+
ORIG_PATH="$PATH"
2021
source /var/vcap/packages/golang-1-linux/bosh/runtime.env
22+
export GOPATH="${HOME}/go"
23+
export GOCACHE="${GOPATH}/cache"
24+
export PATH="${GOROOT}/bin:${GOPATH}/bin:${ORIG_PATH}" # the golang source script above injects a bunch of incorrect values here
2125
export PATH=/var/vcap/packages/jumpbox/bin:$PATH
2226
export LD_LIBRARY_PATH=/var/vcap/packages/jumpbox/lib
2327
export MANPATH=/usr/share/man:/var/vcap/packages/jumpbox/share/man:/var/vcap/packages/jumpbox/man
File renamed without changes.

packages/jumpbox/packaging

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,4 @@ while [[ $n -gt 0 ]]; do
7575
n=$((n - 1))
7676
done
7777

78-
sudo cp jumpbox/vimrc /usr/share/vim/vimrc
7978
cp jumpbox/tmux.conf "${BOSH_INSTALL_TARGET}/etc/tmux.conf"

packages/jumpbox/spec

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,6 @@ files:
3838
# tree
3939
- jumpbox/tree-2.0.2.tar.gz
4040

41-
# vim
42-
- jumpbox/vimrc
43-
4441
# wget
45-
- jumpbox/wget-1.21.3.tar.gz # jammy: 1.21.2
42+
- jumpbox/wget-1.21.3.tar.gz
4643

src/jumpbox/setup

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fi
1414

1515
# install ruby
1616

17-
rvm install ruby-2.7
18-
rvm --default use 2.7
17+
rvm install ruby-3.1
18+
rvm --default use 3.1
1919
gem install -N cf-uaac # TODO: move to uaa-cli https://github.com/cloudfoundry-incubator/uaa-cli
2020

0 commit comments

Comments
 (0)