From f5f73b6c9522b83d636f68a599ad7301ffafe2a6 Mon Sep 17 00:00:00 2001
From: "Satadru Pramanik, DO, MPH, MEng" <satadru@gmail.com>
Date: Wed, 2 Oct 2024 13:24:49 -0400
Subject: [PATCH] Update vim packages, tweak upload logic. (#10555)

Signed-off-by: Satadru Pramanik <satadru@gmail.com>
---
 bin/crew                               | 29 +++++++++++++-------------
 lib/const.rb                           |  2 +-
 manifest/armv7l/v/vim_runtime.filelist | 20 ++++++++++++++++++
 manifest/i686/v/vim_runtime.filelist   | 20 ++++++++++++++++++
 manifest/x86_64/v/vim_runtime.filelist | 20 ++++++++++++++++++
 packages/gvim.rb                       |  8 +++----
 packages/vim.rb                        | 10 ++++-----
 packages/vim_runtime.rb                | 10 ++++-----
 packages/xxd_standalone.rb             | 10 ++++-----
 tools/build_updated_packages.rb        |  8 +++++--
 10 files changed, 100 insertions(+), 37 deletions(-)

diff --git a/bin/crew b/bin/crew
index 5b8d52a47..96e24de0d 100755
--- a/bin/crew
+++ b/bin/crew
@@ -1575,27 +1575,26 @@ def upload(pkg_name = nil, pkg_version = nil, gitlab_token = nil, gitlab_token_u
       binary_sha256_block_with_bc = "#{file.match(bc_re)}\n#{binary_sha256_block}"
       File.write(pkg_file, file.gsub(bc_re, binary_sha256_block_with_bc))
     end
-    puts "\e[1A\e[KUploads complete for #{package}.\r".orange
 
     # Upload python wheels if we are dealing with a pip package, but only
     # if a gitlab token username is set. (The generic repo does not
     # require a gitlab token username.)
-    next unless @pkg.superclass.to_s == 'Pip'
-    if gitlab_token_username.nil?
-      puts "\nGITLAB_TOKEN_USERNAME environment variable not set, so generated python wheels will not be uploaded.\n".lightred
-      next package
-    end
-    pip_config = `pip config list`.chomp
-    Kernel.system 'pip config --user set global.trusted-host gitlab.com', %i[err out] => File::NULL unless pip_config.include?("global.trusted-host='gitlab.com'")
+    if @pkg.superclass.to_s == 'Pip'
+      pip_config = `pip config list`.chomp
+      Kernel.system 'pip config --user set global.trusted-host gitlab.com', %i[err out] => File::NULL unless pip_config.include?("global.trusted-host='gitlab.com'")
 
-    pip_cache_dir = `pip cache dir`.chomp
-    wheels = `find #{pip_cache_dir} -type f -name \"*.whl\" -print`.chomp.split
-    next if wheels.empty?
-    wheels.each do |wheel|
-      puts "Uploading #{wheel}.\nNote that a '400 Bad Request' error here means the wheel has already been uploaded.".orange
-      system("twine upload -u #{gitlab_token_username} -p #{gitlab_token} --repository-url #{CREW_GITLAB_PKG_REPO}/pypi --non-interactive #{wheel}", %i[err] => File::NULL)
-      FileUtils.rm_f wheel
+      pip_cache_dir = `pip cache dir`.chomp
+      wheels = `find #{pip_cache_dir} -type f -name \"*.whl\" -print`.chomp.split
+      unless wheels.empty?
+        wheels.each do |wheel|
+          puts "Uploading #{wheel}.\nNote that a '400 Bad Request' error here means the wheel has already been uploaded.".orange
+          # Note that this uses the python twine from https://github.com/pypa/twine/pull/1123
+          system("twine upload -u #{gitlab_token_username} -p #{gitlab_token} --repository-url #{CREW_GITLAB_PKG_REPO}/pypi --non-interactive #{wheel}", %i[err] => File::NULL)
+          FileUtils.rm_f wheel
+        end
+      end
     end
+    puts "\e[1A\e[K🎉 Uploads complete for #{package}. 🎉\r\n".lightgreen
   end
 end
 
diff --git a/lib/const.rb b/lib/const.rb
index 3f1a01b4e..ccdf8fd14 100644
--- a/lib/const.rb
+++ b/lib/const.rb
@@ -3,7 +3,7 @@
 require 'etc'
 
 OLD_CREW_VERSION ||= defined?(CREW_VERSION) ? CREW_VERSION : '1.0'
-CREW_VERSION ||= '1.53.6' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
+CREW_VERSION ||= '1.53.7' unless defined?(CREW_VERSION) && CREW_VERSION == OLD_CREW_VERSION
 
 # Kernel architecture.
 KERN_ARCH ||= Etc.uname[:machine]
diff --git a/manifest/armv7l/v/vim_runtime.filelist b/manifest/armv7l/v/vim_runtime.filelist
index 5367b4f3c..f78babe85 100644
--- a/manifest/armv7l/v/vim_runtime.filelist
+++ b/manifest/armv7l/v/vim_runtime.filelist
@@ -25,7 +25,9 @@
 /usr/local/share/vim/vim91/autoload/gzip.vim
 /usr/local/share/vim/vim91/autoload/hare.vim
 /usr/local/share/vim/vim91/autoload/haskellcomplete.vim
+/usr/local/share/vim/vim91/autoload/hcl.vim
 /usr/local/share/vim/vim91/autoload/htmlcomplete.vim
+/usr/local/share/vim/vim91/autoload/javaformat.vim
 /usr/local/share/vim/vim91/autoload/javascriptcomplete.vim
 /usr/local/share/vim/vim91/autoload/modula2.vim
 /usr/local/share/vim/vim91/autoload/netrw.vim
@@ -136,6 +138,7 @@
 /usr/local/share/vim/vim91/compiler/gm2.vim
 /usr/local/share/vim/vim91/compiler/gnat.vim
 /usr/local/share/vim/vim91/compiler/go.vim
+/usr/local/share/vim/vim91/compiler/groff.vim
 /usr/local/share/vim/vim91/compiler/haml.vim
 /usr/local/share/vim/vim91/compiler/hare.vim
 /usr/local/share/vim/vim91/compiler/hp_acc.vim
@@ -152,6 +155,7 @@
 /usr/local/share/vim/vim91/compiler/jq.vim
 /usr/local/share/vim/vim91/compiler/jshint.vim
 /usr/local/share/vim/vim91/compiler/jsonlint.vim
+/usr/local/share/vim/vim91/compiler/make.vim
 /usr/local/share/vim/vim91/compiler/mcs.vim
 /usr/local/share/vim/vim91/compiler/mips_c.vim
 /usr/local/share/vim/vim91/compiler/mipspro_c89.vim
@@ -488,6 +492,7 @@
 /usr/local/share/vim/vim91/ftplugin/gitrebase.vim
 /usr/local/share/vim/vim91/ftplugin/gitsendemail.vim
 /usr/local/share/vim/vim91/ftplugin/go.vim
+/usr/local/share/vim/vim91/ftplugin/goaccess.vim
 /usr/local/share/vim/vim91/ftplugin/gomod.vim
 /usr/local/share/vim/vim91/ftplugin/gpg.vim
 /usr/local/share/vim/vim91/ftplugin/gprof.vim
@@ -501,6 +506,7 @@
 /usr/local/share/vim/vim91/ftplugin/hare.vim
 /usr/local/share/vim/vim91/ftplugin/haredoc.vim
 /usr/local/share/vim/vim91/ftplugin/haskell.vim
+/usr/local/share/vim/vim91/ftplugin/hcl.vim
 /usr/local/share/vim/vim91/ftplugin/heex.vim
 /usr/local/share/vim/vim91/ftplugin/help.vim
 /usr/local/share/vim/vim91/ftplugin/hgcommit.vim
@@ -511,6 +517,7 @@
 /usr/local/share/vim/vim91/ftplugin/html.vim
 /usr/local/share/vim/vim91/ftplugin/htmlangular.vim
 /usr/local/share/vim/vim91/ftplugin/htmldjango.vim
+/usr/local/share/vim/vim91/ftplugin/http.vim
 /usr/local/share/vim/vim91/ftplugin/hurl.vim
 /usr/local/share/vim/vim91/ftplugin/hyprlang.vim
 /usr/local/share/vim/vim91/ftplugin/i3config.vim
@@ -592,6 +599,7 @@
 /usr/local/share/vim/vim91/ftplugin/nix.vim
 /usr/local/share/vim/vim91/ftplugin/nroff.vim
 /usr/local/share/vim/vim91/ftplugin/nsis.vim
+/usr/local/share/vim/vim91/ftplugin/nu.vim
 /usr/local/share/vim/vim91/ftplugin/objc.vim
 /usr/local/share/vim/vim91/ftplugin/objcpp.vim
 /usr/local/share/vim/vim91/ftplugin/objdump.vim
@@ -698,6 +706,7 @@
 /usr/local/share/vim/vim91/ftplugin/tex.vim
 /usr/local/share/vim/vim91/ftplugin/text.vim
 /usr/local/share/vim/vim91/ftplugin/tf.vim
+/usr/local/share/vim/vim91/ftplugin/thrift.vim
 /usr/local/share/vim/vim91/ftplugin/tidy.vim
 /usr/local/share/vim/vim91/ftplugin/tmux.vim
 /usr/local/share/vim/vim91/ftplugin/toml.vim
@@ -807,6 +816,7 @@
 /usr/local/share/vim/vim91/indent/haml.vim
 /usr/local/share/vim/vim91/indent/hamster.vim
 /usr/local/share/vim/vim91/indent/hare.vim
+/usr/local/share/vim/vim91/indent/hcl.vim
 /usr/local/share/vim/vim91/indent/hog.vim
 /usr/local/share/vim/vim91/indent/html.vim
 /usr/local/share/vim/vim91/indent/htmldjango.vim
@@ -854,6 +864,7 @@
 /usr/local/share/vim/vim91/indent/postscr.vim
 /usr/local/share/vim/vim91/indent/pov.vim
 /usr/local/share/vim/vim91/indent/prolog.vim
+/usr/local/share/vim/vim91/indent/proto.vim
 /usr/local/share/vim/vim91/indent/ps1.vim
 /usr/local/share/vim/vim91/indent/pyrex.vim
 /usr/local/share/vim/vim91/indent/python.vim
@@ -891,8 +902,10 @@
 /usr/local/share/vim/vim91/indent/tcl.vim
 /usr/local/share/vim/vim91/indent/tcsh.vim
 /usr/local/share/vim/vim91/indent/teraterm.vim
+/usr/local/share/vim/vim91/indent/terraform.vim
 /usr/local/share/vim/vim91/indent/tex.vim
 /usr/local/share/vim/vim91/indent/tf.vim
+/usr/local/share/vim/vim91/indent/thrift.vim
 /usr/local/share/vim/vim91/indent/tilde.vim
 /usr/local/share/vim/vim91/indent/treetop.vim
 /usr/local/share/vim/vim91/indent/typescript.vim
@@ -1265,6 +1278,7 @@
 /usr/local/share/vim/vim91/syntax/gnash.vim
 /usr/local/share/vim/vim91/syntax/gnuplot.vim
 /usr/local/share/vim/vim91/syntax/go.vim
+/usr/local/share/vim/vim91/syntax/goaccess.vim
 /usr/local/share/vim/vim91/syntax/godoc.vim
 /usr/local/share/vim/vim91/syntax/gp.vim
 /usr/local/share/vim/vim91/syntax/gpg.vim
@@ -1287,6 +1301,7 @@
 /usr/local/share/vim/vim91/syntax/haste.vim
 /usr/local/share/vim/vim91/syntax/hastepreproc.vim
 /usr/local/share/vim/vim91/syntax/hb.vim
+/usr/local/share/vim/vim91/syntax/hcl.vim
 /usr/local/share/vim/vim91/syntax/help.vim
 /usr/local/share/vim/vim91/syntax/help_ru.vim
 /usr/local/share/vim/vim91/syntax/hercules.vim
@@ -1299,6 +1314,7 @@
 /usr/local/share/vim/vim91/syntax/hostconf.vim
 /usr/local/share/vim/vim91/syntax/hostsaccess.vim
 /usr/local/share/vim/vim91/syntax/html.vim
+/usr/local/share/vim/vim91/syntax/htmlangular.vim
 /usr/local/share/vim/vim91/syntax/htmlcheetah.vim
 /usr/local/share/vim/vim91/syntax/htmldjango.vim
 /usr/local/share/vim/vim91/syntax/htmlm4.vim
@@ -1329,6 +1345,7 @@
 /usr/local/share/vim/vim91/syntax/javascriptreact.vim
 /usr/local/share/vim/vim91/syntax/jess.vim
 /usr/local/share/vim/vim91/syntax/jgraph.vim
+/usr/local/share/vim/vim91/syntax/jinja.vim
 /usr/local/share/vim/vim91/syntax/jj.vim
 /usr/local/share/vim/vim91/syntax/jovial.vim
 /usr/local/share/vim/vim91/syntax/jproperties.vim
@@ -1559,6 +1576,7 @@
 /usr/local/share/vim/vim91/syntax/rtf.vim
 /usr/local/share/vim/vim91/syntax/ruby.vim
 /usr/local/share/vim/vim91/syntax/rust.vim
+/usr/local/share/vim/vim91/syntax/salt.vim
 /usr/local/share/vim/vim91/syntax/samba.vim
 /usr/local/share/vim/vim91/syntax/sas.vim
 /usr/local/share/vim/vim91/syntax/sass.vim
@@ -1674,10 +1692,12 @@
 /usr/local/share/vim/vim91/syntax/template.vim
 /usr/local/share/vim/vim91/syntax/teraterm.vim
 /usr/local/share/vim/vim91/syntax/terminfo.vim
+/usr/local/share/vim/vim91/syntax/terraform.vim
 /usr/local/share/vim/vim91/syntax/tex.vim
 /usr/local/share/vim/vim91/syntax/texinfo.vim
 /usr/local/share/vim/vim91/syntax/texmf.vim
 /usr/local/share/vim/vim91/syntax/tf.vim
+/usr/local/share/vim/vim91/syntax/thrift.vim
 /usr/local/share/vim/vim91/syntax/tidy.vim
 /usr/local/share/vim/vim91/syntax/tilde.vim
 /usr/local/share/vim/vim91/syntax/tli.vim
diff --git a/manifest/i686/v/vim_runtime.filelist b/manifest/i686/v/vim_runtime.filelist
index 5367b4f3c..f78babe85 100644
--- a/manifest/i686/v/vim_runtime.filelist
+++ b/manifest/i686/v/vim_runtime.filelist
@@ -25,7 +25,9 @@
 /usr/local/share/vim/vim91/autoload/gzip.vim
 /usr/local/share/vim/vim91/autoload/hare.vim
 /usr/local/share/vim/vim91/autoload/haskellcomplete.vim
+/usr/local/share/vim/vim91/autoload/hcl.vim
 /usr/local/share/vim/vim91/autoload/htmlcomplete.vim
+/usr/local/share/vim/vim91/autoload/javaformat.vim
 /usr/local/share/vim/vim91/autoload/javascriptcomplete.vim
 /usr/local/share/vim/vim91/autoload/modula2.vim
 /usr/local/share/vim/vim91/autoload/netrw.vim
@@ -136,6 +138,7 @@
 /usr/local/share/vim/vim91/compiler/gm2.vim
 /usr/local/share/vim/vim91/compiler/gnat.vim
 /usr/local/share/vim/vim91/compiler/go.vim
+/usr/local/share/vim/vim91/compiler/groff.vim
 /usr/local/share/vim/vim91/compiler/haml.vim
 /usr/local/share/vim/vim91/compiler/hare.vim
 /usr/local/share/vim/vim91/compiler/hp_acc.vim
@@ -152,6 +155,7 @@
 /usr/local/share/vim/vim91/compiler/jq.vim
 /usr/local/share/vim/vim91/compiler/jshint.vim
 /usr/local/share/vim/vim91/compiler/jsonlint.vim
+/usr/local/share/vim/vim91/compiler/make.vim
 /usr/local/share/vim/vim91/compiler/mcs.vim
 /usr/local/share/vim/vim91/compiler/mips_c.vim
 /usr/local/share/vim/vim91/compiler/mipspro_c89.vim
@@ -488,6 +492,7 @@
 /usr/local/share/vim/vim91/ftplugin/gitrebase.vim
 /usr/local/share/vim/vim91/ftplugin/gitsendemail.vim
 /usr/local/share/vim/vim91/ftplugin/go.vim
+/usr/local/share/vim/vim91/ftplugin/goaccess.vim
 /usr/local/share/vim/vim91/ftplugin/gomod.vim
 /usr/local/share/vim/vim91/ftplugin/gpg.vim
 /usr/local/share/vim/vim91/ftplugin/gprof.vim
@@ -501,6 +506,7 @@
 /usr/local/share/vim/vim91/ftplugin/hare.vim
 /usr/local/share/vim/vim91/ftplugin/haredoc.vim
 /usr/local/share/vim/vim91/ftplugin/haskell.vim
+/usr/local/share/vim/vim91/ftplugin/hcl.vim
 /usr/local/share/vim/vim91/ftplugin/heex.vim
 /usr/local/share/vim/vim91/ftplugin/help.vim
 /usr/local/share/vim/vim91/ftplugin/hgcommit.vim
@@ -511,6 +517,7 @@
 /usr/local/share/vim/vim91/ftplugin/html.vim
 /usr/local/share/vim/vim91/ftplugin/htmlangular.vim
 /usr/local/share/vim/vim91/ftplugin/htmldjango.vim
+/usr/local/share/vim/vim91/ftplugin/http.vim
 /usr/local/share/vim/vim91/ftplugin/hurl.vim
 /usr/local/share/vim/vim91/ftplugin/hyprlang.vim
 /usr/local/share/vim/vim91/ftplugin/i3config.vim
@@ -592,6 +599,7 @@
 /usr/local/share/vim/vim91/ftplugin/nix.vim
 /usr/local/share/vim/vim91/ftplugin/nroff.vim
 /usr/local/share/vim/vim91/ftplugin/nsis.vim
+/usr/local/share/vim/vim91/ftplugin/nu.vim
 /usr/local/share/vim/vim91/ftplugin/objc.vim
 /usr/local/share/vim/vim91/ftplugin/objcpp.vim
 /usr/local/share/vim/vim91/ftplugin/objdump.vim
@@ -698,6 +706,7 @@
 /usr/local/share/vim/vim91/ftplugin/tex.vim
 /usr/local/share/vim/vim91/ftplugin/text.vim
 /usr/local/share/vim/vim91/ftplugin/tf.vim
+/usr/local/share/vim/vim91/ftplugin/thrift.vim
 /usr/local/share/vim/vim91/ftplugin/tidy.vim
 /usr/local/share/vim/vim91/ftplugin/tmux.vim
 /usr/local/share/vim/vim91/ftplugin/toml.vim
@@ -807,6 +816,7 @@
 /usr/local/share/vim/vim91/indent/haml.vim
 /usr/local/share/vim/vim91/indent/hamster.vim
 /usr/local/share/vim/vim91/indent/hare.vim
+/usr/local/share/vim/vim91/indent/hcl.vim
 /usr/local/share/vim/vim91/indent/hog.vim
 /usr/local/share/vim/vim91/indent/html.vim
 /usr/local/share/vim/vim91/indent/htmldjango.vim
@@ -854,6 +864,7 @@
 /usr/local/share/vim/vim91/indent/postscr.vim
 /usr/local/share/vim/vim91/indent/pov.vim
 /usr/local/share/vim/vim91/indent/prolog.vim
+/usr/local/share/vim/vim91/indent/proto.vim
 /usr/local/share/vim/vim91/indent/ps1.vim
 /usr/local/share/vim/vim91/indent/pyrex.vim
 /usr/local/share/vim/vim91/indent/python.vim
@@ -891,8 +902,10 @@
 /usr/local/share/vim/vim91/indent/tcl.vim
 /usr/local/share/vim/vim91/indent/tcsh.vim
 /usr/local/share/vim/vim91/indent/teraterm.vim
+/usr/local/share/vim/vim91/indent/terraform.vim
 /usr/local/share/vim/vim91/indent/tex.vim
 /usr/local/share/vim/vim91/indent/tf.vim
+/usr/local/share/vim/vim91/indent/thrift.vim
 /usr/local/share/vim/vim91/indent/tilde.vim
 /usr/local/share/vim/vim91/indent/treetop.vim
 /usr/local/share/vim/vim91/indent/typescript.vim
@@ -1265,6 +1278,7 @@
 /usr/local/share/vim/vim91/syntax/gnash.vim
 /usr/local/share/vim/vim91/syntax/gnuplot.vim
 /usr/local/share/vim/vim91/syntax/go.vim
+/usr/local/share/vim/vim91/syntax/goaccess.vim
 /usr/local/share/vim/vim91/syntax/godoc.vim
 /usr/local/share/vim/vim91/syntax/gp.vim
 /usr/local/share/vim/vim91/syntax/gpg.vim
@@ -1287,6 +1301,7 @@
 /usr/local/share/vim/vim91/syntax/haste.vim
 /usr/local/share/vim/vim91/syntax/hastepreproc.vim
 /usr/local/share/vim/vim91/syntax/hb.vim
+/usr/local/share/vim/vim91/syntax/hcl.vim
 /usr/local/share/vim/vim91/syntax/help.vim
 /usr/local/share/vim/vim91/syntax/help_ru.vim
 /usr/local/share/vim/vim91/syntax/hercules.vim
@@ -1299,6 +1314,7 @@
 /usr/local/share/vim/vim91/syntax/hostconf.vim
 /usr/local/share/vim/vim91/syntax/hostsaccess.vim
 /usr/local/share/vim/vim91/syntax/html.vim
+/usr/local/share/vim/vim91/syntax/htmlangular.vim
 /usr/local/share/vim/vim91/syntax/htmlcheetah.vim
 /usr/local/share/vim/vim91/syntax/htmldjango.vim
 /usr/local/share/vim/vim91/syntax/htmlm4.vim
@@ -1329,6 +1345,7 @@
 /usr/local/share/vim/vim91/syntax/javascriptreact.vim
 /usr/local/share/vim/vim91/syntax/jess.vim
 /usr/local/share/vim/vim91/syntax/jgraph.vim
+/usr/local/share/vim/vim91/syntax/jinja.vim
 /usr/local/share/vim/vim91/syntax/jj.vim
 /usr/local/share/vim/vim91/syntax/jovial.vim
 /usr/local/share/vim/vim91/syntax/jproperties.vim
@@ -1559,6 +1576,7 @@
 /usr/local/share/vim/vim91/syntax/rtf.vim
 /usr/local/share/vim/vim91/syntax/ruby.vim
 /usr/local/share/vim/vim91/syntax/rust.vim
+/usr/local/share/vim/vim91/syntax/salt.vim
 /usr/local/share/vim/vim91/syntax/samba.vim
 /usr/local/share/vim/vim91/syntax/sas.vim
 /usr/local/share/vim/vim91/syntax/sass.vim
@@ -1674,10 +1692,12 @@
 /usr/local/share/vim/vim91/syntax/template.vim
 /usr/local/share/vim/vim91/syntax/teraterm.vim
 /usr/local/share/vim/vim91/syntax/terminfo.vim
+/usr/local/share/vim/vim91/syntax/terraform.vim
 /usr/local/share/vim/vim91/syntax/tex.vim
 /usr/local/share/vim/vim91/syntax/texinfo.vim
 /usr/local/share/vim/vim91/syntax/texmf.vim
 /usr/local/share/vim/vim91/syntax/tf.vim
+/usr/local/share/vim/vim91/syntax/thrift.vim
 /usr/local/share/vim/vim91/syntax/tidy.vim
 /usr/local/share/vim/vim91/syntax/tilde.vim
 /usr/local/share/vim/vim91/syntax/tli.vim
diff --git a/manifest/x86_64/v/vim_runtime.filelist b/manifest/x86_64/v/vim_runtime.filelist
index 5367b4f3c..f78babe85 100644
--- a/manifest/x86_64/v/vim_runtime.filelist
+++ b/manifest/x86_64/v/vim_runtime.filelist
@@ -25,7 +25,9 @@
 /usr/local/share/vim/vim91/autoload/gzip.vim
 /usr/local/share/vim/vim91/autoload/hare.vim
 /usr/local/share/vim/vim91/autoload/haskellcomplete.vim
+/usr/local/share/vim/vim91/autoload/hcl.vim
 /usr/local/share/vim/vim91/autoload/htmlcomplete.vim
+/usr/local/share/vim/vim91/autoload/javaformat.vim
 /usr/local/share/vim/vim91/autoload/javascriptcomplete.vim
 /usr/local/share/vim/vim91/autoload/modula2.vim
 /usr/local/share/vim/vim91/autoload/netrw.vim
@@ -136,6 +138,7 @@
 /usr/local/share/vim/vim91/compiler/gm2.vim
 /usr/local/share/vim/vim91/compiler/gnat.vim
 /usr/local/share/vim/vim91/compiler/go.vim
+/usr/local/share/vim/vim91/compiler/groff.vim
 /usr/local/share/vim/vim91/compiler/haml.vim
 /usr/local/share/vim/vim91/compiler/hare.vim
 /usr/local/share/vim/vim91/compiler/hp_acc.vim
@@ -152,6 +155,7 @@
 /usr/local/share/vim/vim91/compiler/jq.vim
 /usr/local/share/vim/vim91/compiler/jshint.vim
 /usr/local/share/vim/vim91/compiler/jsonlint.vim
+/usr/local/share/vim/vim91/compiler/make.vim
 /usr/local/share/vim/vim91/compiler/mcs.vim
 /usr/local/share/vim/vim91/compiler/mips_c.vim
 /usr/local/share/vim/vim91/compiler/mipspro_c89.vim
@@ -488,6 +492,7 @@
 /usr/local/share/vim/vim91/ftplugin/gitrebase.vim
 /usr/local/share/vim/vim91/ftplugin/gitsendemail.vim
 /usr/local/share/vim/vim91/ftplugin/go.vim
+/usr/local/share/vim/vim91/ftplugin/goaccess.vim
 /usr/local/share/vim/vim91/ftplugin/gomod.vim
 /usr/local/share/vim/vim91/ftplugin/gpg.vim
 /usr/local/share/vim/vim91/ftplugin/gprof.vim
@@ -501,6 +506,7 @@
 /usr/local/share/vim/vim91/ftplugin/hare.vim
 /usr/local/share/vim/vim91/ftplugin/haredoc.vim
 /usr/local/share/vim/vim91/ftplugin/haskell.vim
+/usr/local/share/vim/vim91/ftplugin/hcl.vim
 /usr/local/share/vim/vim91/ftplugin/heex.vim
 /usr/local/share/vim/vim91/ftplugin/help.vim
 /usr/local/share/vim/vim91/ftplugin/hgcommit.vim
@@ -511,6 +517,7 @@
 /usr/local/share/vim/vim91/ftplugin/html.vim
 /usr/local/share/vim/vim91/ftplugin/htmlangular.vim
 /usr/local/share/vim/vim91/ftplugin/htmldjango.vim
+/usr/local/share/vim/vim91/ftplugin/http.vim
 /usr/local/share/vim/vim91/ftplugin/hurl.vim
 /usr/local/share/vim/vim91/ftplugin/hyprlang.vim
 /usr/local/share/vim/vim91/ftplugin/i3config.vim
@@ -592,6 +599,7 @@
 /usr/local/share/vim/vim91/ftplugin/nix.vim
 /usr/local/share/vim/vim91/ftplugin/nroff.vim
 /usr/local/share/vim/vim91/ftplugin/nsis.vim
+/usr/local/share/vim/vim91/ftplugin/nu.vim
 /usr/local/share/vim/vim91/ftplugin/objc.vim
 /usr/local/share/vim/vim91/ftplugin/objcpp.vim
 /usr/local/share/vim/vim91/ftplugin/objdump.vim
@@ -698,6 +706,7 @@
 /usr/local/share/vim/vim91/ftplugin/tex.vim
 /usr/local/share/vim/vim91/ftplugin/text.vim
 /usr/local/share/vim/vim91/ftplugin/tf.vim
+/usr/local/share/vim/vim91/ftplugin/thrift.vim
 /usr/local/share/vim/vim91/ftplugin/tidy.vim
 /usr/local/share/vim/vim91/ftplugin/tmux.vim
 /usr/local/share/vim/vim91/ftplugin/toml.vim
@@ -807,6 +816,7 @@
 /usr/local/share/vim/vim91/indent/haml.vim
 /usr/local/share/vim/vim91/indent/hamster.vim
 /usr/local/share/vim/vim91/indent/hare.vim
+/usr/local/share/vim/vim91/indent/hcl.vim
 /usr/local/share/vim/vim91/indent/hog.vim
 /usr/local/share/vim/vim91/indent/html.vim
 /usr/local/share/vim/vim91/indent/htmldjango.vim
@@ -854,6 +864,7 @@
 /usr/local/share/vim/vim91/indent/postscr.vim
 /usr/local/share/vim/vim91/indent/pov.vim
 /usr/local/share/vim/vim91/indent/prolog.vim
+/usr/local/share/vim/vim91/indent/proto.vim
 /usr/local/share/vim/vim91/indent/ps1.vim
 /usr/local/share/vim/vim91/indent/pyrex.vim
 /usr/local/share/vim/vim91/indent/python.vim
@@ -891,8 +902,10 @@
 /usr/local/share/vim/vim91/indent/tcl.vim
 /usr/local/share/vim/vim91/indent/tcsh.vim
 /usr/local/share/vim/vim91/indent/teraterm.vim
+/usr/local/share/vim/vim91/indent/terraform.vim
 /usr/local/share/vim/vim91/indent/tex.vim
 /usr/local/share/vim/vim91/indent/tf.vim
+/usr/local/share/vim/vim91/indent/thrift.vim
 /usr/local/share/vim/vim91/indent/tilde.vim
 /usr/local/share/vim/vim91/indent/treetop.vim
 /usr/local/share/vim/vim91/indent/typescript.vim
@@ -1265,6 +1278,7 @@
 /usr/local/share/vim/vim91/syntax/gnash.vim
 /usr/local/share/vim/vim91/syntax/gnuplot.vim
 /usr/local/share/vim/vim91/syntax/go.vim
+/usr/local/share/vim/vim91/syntax/goaccess.vim
 /usr/local/share/vim/vim91/syntax/godoc.vim
 /usr/local/share/vim/vim91/syntax/gp.vim
 /usr/local/share/vim/vim91/syntax/gpg.vim
@@ -1287,6 +1301,7 @@
 /usr/local/share/vim/vim91/syntax/haste.vim
 /usr/local/share/vim/vim91/syntax/hastepreproc.vim
 /usr/local/share/vim/vim91/syntax/hb.vim
+/usr/local/share/vim/vim91/syntax/hcl.vim
 /usr/local/share/vim/vim91/syntax/help.vim
 /usr/local/share/vim/vim91/syntax/help_ru.vim
 /usr/local/share/vim/vim91/syntax/hercules.vim
@@ -1299,6 +1314,7 @@
 /usr/local/share/vim/vim91/syntax/hostconf.vim
 /usr/local/share/vim/vim91/syntax/hostsaccess.vim
 /usr/local/share/vim/vim91/syntax/html.vim
+/usr/local/share/vim/vim91/syntax/htmlangular.vim
 /usr/local/share/vim/vim91/syntax/htmlcheetah.vim
 /usr/local/share/vim/vim91/syntax/htmldjango.vim
 /usr/local/share/vim/vim91/syntax/htmlm4.vim
@@ -1329,6 +1345,7 @@
 /usr/local/share/vim/vim91/syntax/javascriptreact.vim
 /usr/local/share/vim/vim91/syntax/jess.vim
 /usr/local/share/vim/vim91/syntax/jgraph.vim
+/usr/local/share/vim/vim91/syntax/jinja.vim
 /usr/local/share/vim/vim91/syntax/jj.vim
 /usr/local/share/vim/vim91/syntax/jovial.vim
 /usr/local/share/vim/vim91/syntax/jproperties.vim
@@ -1559,6 +1576,7 @@
 /usr/local/share/vim/vim91/syntax/rtf.vim
 /usr/local/share/vim/vim91/syntax/ruby.vim
 /usr/local/share/vim/vim91/syntax/rust.vim
+/usr/local/share/vim/vim91/syntax/salt.vim
 /usr/local/share/vim/vim91/syntax/samba.vim
 /usr/local/share/vim/vim91/syntax/sas.vim
 /usr/local/share/vim/vim91/syntax/sass.vim
@@ -1674,10 +1692,12 @@
 /usr/local/share/vim/vim91/syntax/template.vim
 /usr/local/share/vim/vim91/syntax/teraterm.vim
 /usr/local/share/vim/vim91/syntax/terminfo.vim
+/usr/local/share/vim/vim91/syntax/terraform.vim
 /usr/local/share/vim/vim91/syntax/tex.vim
 /usr/local/share/vim/vim91/syntax/texinfo.vim
 /usr/local/share/vim/vim91/syntax/texmf.vim
 /usr/local/share/vim/vim91/syntax/tf.vim
+/usr/local/share/vim/vim91/syntax/thrift.vim
 /usr/local/share/vim/vim91/syntax/tidy.vim
 /usr/local/share/vim/vim91/syntax/tilde.vim
 /usr/local/share/vim/vim91/syntax/tli.vim
diff --git a/packages/gvim.rb b/packages/gvim.rb
index 2a3afe8da..8580b5ffc 100644
--- a/packages/gvim.rb
+++ b/packages/gvim.rb
@@ -3,7 +3,7 @@ require 'buildsystems/autotools'
 class Gvim < Autotools
   description 'Vim is a highly configurable text editor built to make creating and changing any kind of text very efficient. (with advanced features, such as a GUI)'
   homepage 'https://www.vim.org/'
-  version '9.1.0636'
+  version '9.1.0754'
   license 'GPL-2'
   compatibility 'x86_64 aarch64 armv7l'
   source_url 'https://github.com/vim/vim.git'
@@ -11,9 +11,9 @@ class Gvim < Autotools
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'ee506c19e146acd96d3b003e0a7e2220af022c00405043e2bddfbefcfc8f43ba',
-     armv7l: 'ee506c19e146acd96d3b003e0a7e2220af022c00405043e2bddfbefcfc8f43ba',
-     x86_64: '13d28e9abd4b533e2c0c504e35ba9af7a55dc0e014d8da313c47e269cae061c0'
+    aarch64: 'cf780b16e05bd6817a651621e4a8eba900d453c010bbdc75818b052b6a1ffab4',
+     armv7l: 'cf780b16e05bd6817a651621e4a8eba900d453c010bbdc75818b052b6a1ffab4',
+     x86_64: 'bc91d1d004ff740c8ddeca4c4574cfe62c2797b453e47bfeb97aa081f441fc1a'
   })
 
   depends_on 'acl' # R
diff --git a/packages/vim.rb b/packages/vim.rb
index 62a1bf4c9..7b08af2c4 100644
--- a/packages/vim.rb
+++ b/packages/vim.rb
@@ -3,7 +3,7 @@ require 'buildsystems/autotools'
 class Vim < Autotools
   description 'Vim is a highly configurable text editor built to make creating and changing any kind of text very efficient.'
   homepage 'https://www.vim.org/'
-  version '9.1.0636'
+  version '9.1.0754'
   license 'GPL-2'
   compatibility 'all'
   source_url 'https://github.com/vim/vim.git'
@@ -11,10 +11,10 @@ class Vim < Autotools
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'a22696a56b452ab918f6ab68a67f51d7a8e1c9a744d495cc80279b5fb083b541',
-     armv7l: 'a22696a56b452ab918f6ab68a67f51d7a8e1c9a744d495cc80279b5fb083b541',
-       i686: '6820ad9b19ecb5fed21f04538ac1dfe051817c8b3f1e5b4cf2c158a49a683543',
-     x86_64: '59dd658fe6ee9c3645e58cdd7b37ee950ab8e9edd8c639c21789d61223d0c277'
+    aarch64: 'f2796f4bf35bd9e5a3051370735c98d6a65948066349c7a6fe96dfb0910efb41',
+     armv7l: 'f2796f4bf35bd9e5a3051370735c98d6a65948066349c7a6fe96dfb0910efb41',
+       i686: '8c1e6db9af62683f616fea0427e3f132154afff5e696da87cb1eb9f5382f38dc',
+     x86_64: '4fa687d94c172f504f95db0cbdaf8ba4815125781427466e7434335650bdace1'
   })
 
   depends_on 'vim_runtime' # R
diff --git a/packages/vim_runtime.rb b/packages/vim_runtime.rb
index 66a231bfc..9fcb92a5b 100644
--- a/packages/vim_runtime.rb
+++ b/packages/vim_runtime.rb
@@ -3,7 +3,7 @@ require 'buildsystems/autotools'
 class Vim_runtime < Autotools
   description 'Vim is a highly configurable text editor built to make creating and changing any kind of text very efficient. (shared runtime)'
   homepage 'https://www.vim.org/'
-  version '9.1.0636'
+  version '9.1.0754'
   license 'GPL-2'
   compatibility 'all'
   source_url 'https://github.com/vim/vim.git'
@@ -11,10 +11,10 @@ class Vim_runtime < Autotools
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: '350aecc5bb7086f23f47074a9a44b33004b369396644065eb9a1babdfc0d2764',
-     armv7l: '350aecc5bb7086f23f47074a9a44b33004b369396644065eb9a1babdfc0d2764',
-       i686: '8cc9c3d7783fa8a4e68552db466a0cd0c0f3ca554dc73db51869175c8e431f42',
-     x86_64: 'a669496517825d332fb1b69f7f06ef0d0280839134ee9d9c9084a35bfcead7cc'
+    aarch64: '8035a5d75aaa89147c1bdf45ef18a7945687eea39e0df39fc8cb6f505c0aa5cb',
+     armv7l: '8035a5d75aaa89147c1bdf45ef18a7945687eea39e0df39fc8cb6f505c0aa5cb',
+       i686: '16dcfc65d185441974feec88a89faa58f863f4e23d87d1df97895833a056d401',
+     x86_64: 'c992b7a2c650305b2ad13982f1d8068d04c03768a699fcb4a2c54797cc8b6736'
   })
 
   depends_on 'gpm' # R
diff --git a/packages/xxd_standalone.rb b/packages/xxd_standalone.rb
index f7b4a97c0..87165ee7f 100644
--- a/packages/xxd_standalone.rb
+++ b/packages/xxd_standalone.rb
@@ -3,7 +3,7 @@ require 'package'
 class Xxd_standalone < Package
   description 'Hexdump utility from vim'
   homepage 'https://www.vim.org/'
-  version '9.1.0188'
+  version '9.1.0754'
   license 'GPL-2'
   compatibility 'all'
   source_url 'https://github.com/vim/vim.git'
@@ -11,10 +11,10 @@ class Xxd_standalone < Package
   binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: '244fb157da66a01175118fa7b1f4c9e1b0f31523bf9a975de015b3091b364fef',
-     armv7l: '244fb157da66a01175118fa7b1f4c9e1b0f31523bf9a975de015b3091b364fef',
-       i686: '994a7d4596c5e864c56ada0a70e70597db13bc41dc570dd9136e9f888ca7dc66',
-     x86_64: '833b7e34f728edaa2ac1d472348f7d706c92570d8aeb3260ec384ba017482eb7'
+    aarch64: 'ce3214bcb20f591aca75497f1be94d0ee24b962214310b944d9ceacc7c06d883',
+     armv7l: 'ce3214bcb20f591aca75497f1be94d0ee24b962214310b944d9ceacc7c06d883',
+       i686: '8af40856fa71e8ba389a759043efaa5448691ff907550c54989ab0a2447fde4c',
+     x86_64: '3c363bdb4841a3dfbc324a485dd9456a2ae2fe82e0336c989f6ebd7b1c38132d'
   })
 
   depends_on 'glibc' # R
diff --git a/tools/build_updated_packages.rb b/tools/build_updated_packages.rb
index e3cc1e2d0..9b3dc2eb1 100755
--- a/tools/build_updated_packages.rb
+++ b/tools/build_updated_packages.rb
@@ -190,8 +190,12 @@ updated_packages.each do |pkg|
       next
     else
       puts "#{name.capitalize} #{@version} needs builds uploaded for: #{build.join(' ')}".lightblue
+      system "yes | crew build -f #{pkg}" if build.include?(ARCH) && !File.file?("release/#{ARCH}/#{name}-#{@version}-chromeos-#{ARCH}.#{@binary_compression}") && agree_default_yes("\nWould you like to build #{name} #{@version}")
+      upload_pkg = nil
+      build.each do |build|
+        upload_pkg = true if File.file?("release/#{build}/#{name}-#{@version}-chromeos-#{build}.#{@binary_compression}")
+      end
+      system "crew upload #{name}" if upload_pkg == true && agree_default_yes("\nWould you like to upload #{name} #{@version}")
     end
-    system "yes | crew build -f #{pkg}" if build.include?(ARCH) && !File.file?("release/#{ARCH}/#{name}-#{@version}-chromeos-#{ARCH}.#{@binary_compression}") && agree_default_yes("\nWould you like to build #{name} #{@version}")
-    system "crew upload #{name}" if build.include?(ARCH) && File.file?("release/#{ARCH}/#{name}-#{@version}-chromeos-#{ARCH}.#{@binary_compression}") && agree_default_yes("\nWould you like to upload #{name} #{@version}")
   end
 end