revert(installer): only add rocks.nvim to rtp in install script (#88)

This reverts commit c1ef187. The change prevents files in `plugin` directories, etc. from being sourced.
nvim-neorocks · Dec 17, 2023 · 3d7da89 · 3d7da89
1 parent 26f6357
commit 3d7da89
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/installer.lua b/installer.lua
@@ -396,7 +396,7 @@ local function install()
                     " }",
                     ' package.cpath = package.cpath .. ";" .. table.concat(luarocks_cpath, ";")',
                     " ",
-                    ' vim.opt.runtimepath:append(vim.fs.joinpath(rocks_config.rocks_path, "lib", "luarocks", "rocks-5.1", "rocks.nvim", "*"))',
+                    ' vim.opt.runtimepath:append(vim.fs.joinpath(rocks_config.rocks_path, "lib", "luarocks", "rocks-5.1", "*", "*"))',
                     "<",
                     "Thank you for installing rocks.nvim!",
                     "",

diff --git a/lua/rocks/config/internal.lua b/lua/rocks/config/internal.lua
@@ -19,8 +19,8 @@
 ---@field rocks_path string Local path in your filesystem to install rocks
 ---@field config_path string Rocks declaration file path
 ---@field luarocks_binary string Luarocks binary path
----@field lazy boolean Whether to query luarocks.org lazily
----@field dynamic_rtp boolean Whether to automatically add freshly installed plugins to the 'runtimepath'
+---@field lazy boolean Whether to query luarocks.org lazily.
+---@field dynamic_rtp boolean Whether to automatically add freshly installed plugins to the 'runtimepath'.
 ---@field debug_info RocksConfigDebugInfo
 
 ---@class (exact) RocksConfigDebugInfo

diff --git a/nix/init.lua b/nix/init.lua
@@ -20,4 +20,4 @@ local luarocks_cpath = {
 }
 package.cpath = package.cpath .. ";" .. table.concat(luarocks_cpath, ";")
 
-vim.opt.runtimepath:append(vim.fs.joinpath(rocks_config.rocks_path, "lib", "luarocks", "rocks-5.1", "rocks.nvim", "*"))
+vim.opt.runtimepath:append(vim.fs.joinpath(rocks_config.rocks_path, "lib", "luarocks", "rocks-5.1", "*", "*"))
diff --git a/plugin/rocks.lua b/plugin/rocks.lua
@@ -17,6 +17,3 @@ if not config.lazy then
         })
     end)
 end
-
--- TODO: Add support for `opt`
-vim.opt.runtimepath:append(vim.fs.joinpath(config.rocks_path, "lib", "luarocks", "rocks-5.1", "*", "*"))
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,3 @@ if not config.lazy then @@
             })
         end)
     end
-    -- TODO: Add support for `opt`
-    vim.opt.runtimepath:append(vim.fs.joinpath(config.rocks_path, "lib", "luarocks", "rocks-5.1", "*", "*"))