6 files changed, 8 insertions, 12 deletions
diff --git a/scripts/check-parsers.lua b/scripts/check-parsers.lua
index c2eefd7c9..9d39af482 100755
--- a/scripts/check-parsers.lua
+++ b/scripts/check-parsers.lua
@@ -1,5 +1,5 @@
 #!/usr/bin/env -S nvim -l
-vim.opt.runtimepath:append('.')
+vim.o.rtp = vim.o.rtp .. ',.'
 
 local configs = require('nvim-treesitter.parsers')
 local parsers = #_G.arg > 0 and { unpack(_G.arg) }
diff --git a/scripts/check-queries.lua b/scripts/check-queries.lua
index 94d8951cb..4c9fc86b1 100755
--- a/scripts/check-queries.lua
+++ b/scripts/check-queries.lua
@@ -1,5 +1,5 @@
 #!/usr/bin/env -S nvim -l
-vim.opt.runtimepath:append('.')
+vim.o.rtp = vim.o.rtp .. ',.'
 
 local query_types = require('nvim-treesitter.health').bundled_queries
 local configs = require('nvim-treesitter.parsers')
diff --git a/scripts/install-parsers.lua b/scripts/install-parsers.lua
index c97c6eecc..855c73cbd 100755
--- a/scripts/install-parsers.lua
+++ b/scripts/install-parsers.lua
@@ -1,4 +1,5 @@
 #!/usr/bin/env -S nvim -l
+vim.o.rtp = vim.o.rtp .. ',.'
 
 local generate = false
 local update = false
@@ -16,8 +17,6 @@ for i = 1, #_G.arg do
   end
 end
 
-vim.opt.runtimepath:append('.')
-
 ---@type async.Task
 local task = update and require('nvim-treesitter').update('all', { summary = true })
   or require('nvim-treesitter').install(
diff --git a/scripts/minimal_init.lua b/scripts/minimal_init.lua
index 4a5e14f16..f3e1c3652 100644
--- a/scripts/minimal_init.lua
+++ b/scripts/minimal_init.lua
@@ -1,14 +1,11 @@
-vim.opt.runtimepath:append(os.getenv('PLENARY'))
-vim.opt.runtimepath:append('.')
-vim.cmd.runtime({ 'plugin/plenary.vim', bang = true })
+vim.o.rtp = os.getenv('PLENTEST') .. ',.,' .. vim.o.rtp
+vim.o.rtp = vim.fn.stdpath('data') .. '/site,' .. vim.o.rtp
 vim.cmd.runtime({ 'plugin/query_predicates.lua', bang = true })
 vim.cmd.runtime({ 'plugin/filetypes.lua', bang = true })
 
 vim.filetype.add({
   extension = {
     conf = 'hocon',
-    ncl = 'nickel',
-    tig = 'tiger',
     w = 'wing',
   },
 })
diff --git a/scripts/update-parsers.lua b/scripts/update-parsers.lua
index bab572c27..d3a33ad6c 100755
--- a/scripts/update-parsers.lua
+++ b/scripts/update-parsers.lua
@@ -13,7 +13,7 @@ for i = 1, #_G.arg do
   end
 end
 
-vim.opt.runtimepath:append('.')
+vim.o.rtp = vim.o.rtp .. ',.'
 local util = require('nvim-treesitter.util')
 local parsers = require('nvim-treesitter.parsers')
 
@@ -64,7 +64,7 @@ for k, p in pairs(parsers) do
         sha = stdout[line] and vim.split(stdout[line], '\t')[1]
       end
 
-      if sha and info.revision ~= sha then
+      if sha and sha ~= '' and info.revision ~= sha then
         info.revision = sha
         updates[#updates + 1] = name
       end
diff --git a/scripts/update-readme.lua b/scripts/update-readme.lua
index 19576a284..90b962b5a 100755
--- a/scripts/update-readme.lua
+++ b/scripts/update-readme.lua
@@ -1,5 +1,5 @@
 #!/usr/bin/env -S nvim -l
-vim.opt.runtimepath:append('.')
+vim.o.rtp = vim.o.rtp .. ',.'
 local util = require('nvim-treesitter.util')
 local parsers = require('nvim-treesitter.parsers')
 local tiers = require('nvim-treesitter.config').tiers