From 56e5b79e072e6475e6ee2579171ad54ed5e5663d Mon Sep 17 00:00:00 2001
From: "Dennis J. Bell" <dennis.j.bell@gmail.com>
Date: Wed, 8 Nov 2023 19:40:17 -0800
Subject: [PATCH] Restored hand-compiled vim because builtin missing necessary
 compile-time options

---
 README.md                                            |  2 +-
 config/blobs.yml                                     |  4 ++++
 jobs/jumpbox/spec                                    |  1 -
 jobs/jumpbox/templates/bin/jumpbox_ctl               |  1 -
 packages/jumpbox/packaging                           | 12 ++++++++++--
 packages/jumpbox/spec                                |  4 ++++
 {jobs/jumpbox/templates/config => src/jumpbox}/vimrc |  0
 7 files changed, 19 insertions(+), 5 deletions(-)
 rename {jobs/jumpbox/templates/config => src/jumpbox}/vimrc (100%)

diff --git a/README.md b/README.md
index d26c7313..0d76f303 100644
--- a/README.md
+++ b/README.md
@@ -72,7 +72,7 @@ jumpbox:
 - tmux 3.2a
   - libevent 2.1.12
 - tree 2.0.2
-- vim (on stemcell, currently 8.2.4919)
+- vim 8.2.4528
 - wget 1.21.3
 - zip (on stemcell, currently 3.0)
 - unzip (on stemcell, currently 6.0
diff --git a/config/blobs.yml b/config/blobs.yml
index ea431517..7f3b04e5 100644
--- a/config/blobs.yml
+++ b/config/blobs.yml
@@ -134,6 +134,10 @@ jumpbox/tree-2.0.2.tar.gz:
   size: 57960
   object_id: 7d13bfdf-29b5-43a6-4e84-d7bc537bdc46
   sha: sha256:7d693a1d88d3c4e70a73e03b8dbbdc12c2945d482647494f2f5bd83a479eeeaf
+jumpbox/vim-8.2.4528.tar.gz:
+  size: 16185073
+  object_id: e1f8a296-40b3-44a3-6604-dd85f988b157
+  sha: sha256:10a7e2b089697f247501c5f269536ae736d21d9dbc2065f2517cfb18bf7d7184
 jumpbox/wget-1.21.3.tar.gz:
   size: 5079864
   object_id: eba5bdf1-b13f-43ce-5eed-f0a7f9d502c9
diff --git a/jobs/jumpbox/spec b/jobs/jumpbox/spec
index 53989b36..4d6431bf 100644
--- a/jobs/jumpbox/spec
+++ b/jobs/jumpbox/spec
@@ -9,7 +9,6 @@ templates:
   bin/watcher:     bin/watcher
   config/banner:   config/banner
   config/bashrc:   config/bashrc
-  config/vimrc:    config/vimrc
 
 properties:
   jumpbox.hostname:
diff --git a/jobs/jumpbox/templates/bin/jumpbox_ctl b/jobs/jumpbox/templates/bin/jumpbox_ctl
index c7b324fe..9229ce1a 100644
--- a/jobs/jumpbox/templates/bin/jumpbox_ctl
+++ b/jobs/jumpbox/templates/bin/jumpbox_ctl
@@ -5,7 +5,6 @@ set -e
 rm -f /etc/profile.d/jumpbox.sh
 rm -f /etc/skel/.bashrc
 cp /var/vcap/jobs/jumpbox/config/bashrc /etc/bash.bashrc
-cp /var/vcap/jobs/jumpbox/config/vimrc  /usr/share/vim/vimrc
 
 source /var/vcap/jobs/jumpbox/config/bashrc
 pidfile=/var/vcap/sys/run/jumpbox/watcher.pid
diff --git a/packages/jumpbox/packaging b/packages/jumpbox/packaging
index ffd7a094..e2d78de3 100644
--- a/packages/jumpbox/packaging
+++ b/packages/jumpbox/packaging
@@ -58,6 +58,14 @@ n=$((n + 1))
  make install) &
 n=$((n + 1))
 
+# VIM
+# http://github.com/vim/vim/releases
+(tar -xzvf jumpbox/vim-8.2.4528.tar.gz
+ cd vim-8.2.4528
+ ./configure --prefix=${BOSH_INSTALL_TARGET}
+ make -j${CPUS}
+ make install) &
+n=$((n + 1))
 
 # WGET
 # http://ftp.gnu.org/gnu/wget/
@@ -69,10 +77,10 @@ n=$((n + 1))
  make install) &
 n=$((n + 1))
 
-
 while [[ $n -gt 0 ]]; do
 	wait -n
 	n=$((n - 1))
 done
 
-cp jumpbox/tmux.conf  "${BOSH_INSTALL_TARGET}/etc/tmux.conf"
+cp jumpbox/vimrc     ${BOSH_INSTALL_TARGET}/share/vim/vimrc
+cp jumpbox/tmux.conf ${BOSH_INSTALL_TARGET}/etc/tmux.conf
diff --git a/packages/jumpbox/spec b/packages/jumpbox/spec
index 5ebdbb5b..79adf063 100644
--- a/packages/jumpbox/spec
+++ b/packages/jumpbox/spec
@@ -38,6 +38,10 @@ files:
     # tree
   - jumpbox/tree-2.0.2.tar.gz
 
+    # vim
+  - jumpbox/vim-8.2.4528.tar.gz
+  - jumpbox/vimrc
+
     # wget
   - jumpbox/wget-1.21.3.tar.gz
 
diff --git a/jobs/jumpbox/templates/config/vimrc b/src/jumpbox/vimrc
similarity index 100%
rename from jobs/jumpbox/templates/config/vimrc
rename to src/jumpbox/vimrc