Skip to content

Commit 56e5b79

Browse files
committed
Restored hand-compiled vim because builtin missing necessary compile-time options
1 parent ede462e commit 56e5b79

File tree

7 files changed

+19
-5
lines changed

7 files changed

+19
-5
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jumpbox:
7272
- tmux 3.2a
7373
- libevent 2.1.12
7474
- tree 2.0.2
75-
- vim (on stemcell, currently 8.2.4919)
75+
- vim 8.2.4528
7676
- wget 1.21.3
7777
- zip (on stemcell, currently 3.0)
7878
- unzip (on stemcell, currently 6.0

config/blobs.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ jumpbox/tree-2.0.2.tar.gz:
134134
size: 57960
135135
object_id: 7d13bfdf-29b5-43a6-4e84-d7bc537bdc46
136136
sha: sha256:7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf
137+
jumpbox/vim-8.2.4528.tar.gz:
138+
size: 16185073
139+
object_id: e1f8a296-40b3-44a3-6604-dd85f988b157
140+
sha: sha256:10a7e2b089697f247501c5f269536ae736d21d9dbc2065f2517cfb18bf7d7184
137141
jumpbox/wget-1.21.3.tar.gz:
138142
size: 5079864
139143
object_id: eba5bdf1-b13f-43ce-5eed-f0a7f9d502c9

jobs/jumpbox/spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ templates:
99
bin/watcher: bin/watcher
1010
config/banner: config/banner
1111
config/bashrc: config/bashrc
12-
config/vimrc: config/vimrc
1312

1413
properties:
1514
jumpbox.hostname:

jobs/jumpbox/templates/bin/jumpbox_ctl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ set -e
55
rm -f /etc/profile.d/jumpbox.sh
66
rm -f /etc/skel/.bashrc
77
cp /var/vcap/jobs/jumpbox/config/bashrc /etc/bash.bashrc
8-
cp /var/vcap/jobs/jumpbox/config/vimrc /usr/share/vim/vimrc
98

109
source /var/vcap/jobs/jumpbox/config/bashrc
1110
pidfile=/var/vcap/sys/run/jumpbox/watcher.pid

packages/jumpbox/packaging

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,14 @@ n=$((n + 1))
5858
make install) &
5959
n=$((n + 1))
6060

61+
# VIM
62+
# http://github.com/vim/vim/releases
63+
(tar -xzvf jumpbox/vim-8.2.4528.tar.gz
64+
cd vim-8.2.4528
65+
./configure --prefix=${BOSH_INSTALL_TARGET}
66+
make -j${CPUS}
67+
make install) &
68+
n=$((n + 1))
6169

6270
# WGET
6371
# http://ftp.gnu.org/gnu/wget/
@@ -69,10 +77,10 @@ n=$((n + 1))
6977
make install) &
7078
n=$((n + 1))
7179

72-
7380
while [[ $n -gt 0 ]]; do
7481
wait -n
7582
n=$((n - 1))
7683
done
7784

78-
cp jumpbox/tmux.conf "${BOSH_INSTALL_TARGET}/etc/tmux.conf"
85+
cp jumpbox/vimrc ${BOSH_INSTALL_TARGET}/share/vim/vimrc
86+
cp jumpbox/tmux.conf ${BOSH_INSTALL_TARGET}/etc/tmux.conf

packages/jumpbox/spec

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

41+
# vim
42+
- jumpbox/vim-8.2.4528.tar.gz
43+
- jumpbox/vimrc
44+
4145
# wget
4246
- jumpbox/wget-1.21.3.tar.gz
4347

File renamed without changes.

0 commit comments

Comments
 (0)