diff options
| author | João Valverde <j@v6e.pt> | 2023-08-22 13:29:06 +0100 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2023-08-23 20:28:43 +0100 |
| commit | 9fb85a847d0ae94d6b4a94baa67f16bcfbd965fe (patch) | |
| tree | 039f4dbe414cbe068c2abf387553d7a3548ad3bd /packaging/nsis | |
| parent | d1f08edcba3305eb88d5bfa3f2f8332251ceedcc (diff) | |
Lua: Load init.lua from plugins directory
Instead of having a global init.lua in datafile_dir that may
contain library code, load the init.lua script from the plugins
directories, similar to other Lua scripts, but guaranteed to
be the first one loaded.
This is consistent with our practice and avoids overwriting the
customizable share/wireshark/init.lua with each instalation or
upgrade.
It also should allow using package.path correctly (which does
not include the configuration directory).
The init.lua in the configuration directory is still loaded for
backward compatibility. It generates a warning in the console.
Diffstat (limited to 'packaging/nsis')
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 6a40e465f2..4dea03cae9 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -179,11 +179,6 @@ if (BUILD_wireshark) set(_all_manifest_contents "${_all_manifest_contents}File \"${_path}\"\n") endforeach() endif() - if(LUA_FOUND) - foreach(_script "init.lua") - set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_script}\"\n") - endforeach() - endif() file(WRITE "${_all_manifest}" "${_all_manifest_contents}") endif() @@ -220,9 +215,6 @@ if (BUILD_logray) ) set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_dll}\"\n") endforeach() - foreach(_script "init.lua") - set(_all_manifest_contents "${_all_manifest_contents}File \"\${STAGING_DIR}\\${_script}\"\n") - endforeach() file(WRITE "${_all_manifest}" "${_all_manifest_contents}") endif() |