fix: consider LUA_PATH/LUA_CPATH when searching Lua packages

Makefile

@@ -192,8 +192,8 @@ distclean: depclean
 env:
 	@echo $(LIBRARY_PATH)
 	@echo "export PATH='$(SRCDIR):$(TESTSDIR)/misc:${PATH}'"
-	@echo "export LUA_PATH_5_4='$(SRCDIR)/?.lua;$(TESTSDIR)/lua/?.lua;$${LUA_PATH_5_4:-;}'"
-	@echo "export LUA_CPATH_5_4='$(SRCDIR)/?.so;$${LUA_CPATH_5_4:-;}'"
+	@echo "export LUA_PATH_5_4='$(SRCDIR)/?.lua;$(TESTSDIR)/lua/?.lua;$${LUA_PATH_5_4:-$${LUA_PATH:-;}}'"
+	@echo "export LUA_CPATH_5_4='$(SRCDIR)/?.so;$${LUA_CPATH_5_4:-$${LUA_CPATH:-;}}'"
 
 doc:
 	cd doc && doxygen Doxyfile

tools/template/cartesi-machine-stored-hash.template

@@ -1,4 +1,4 @@
 #!/bin/sh
-export LUA_PATH_5_4="ARG_LUA_PATH;${LUA_PATH_5_4:-;}"
-export LUA_CPATH_5_4="ARG_LUA_CPATH;${LUA_CPATH_5_4:-;}"
+export LUA_PATH_5_4="ARG_LUA_PATH;${LUA_PATH_5_4:-${LUA_PATH:-;}}"
+export LUA_CPATH_5_4="ARG_LUA_CPATH;${LUA_CPATH_5_4:-${LUA_CPATH:-;}}"
 lua5.4 "ARG_LUA_RUNTIME_PATH/cartesi-machine-stored-hash.lua" "$@"

tools/template/cartesi-machine-tests.template

@@ -1,5 +1,5 @@
 #!/bin/sh
-export LUA_PATH_5_4="ARG_LUA_PATH;${LUA_PATH_5_4:-;}"
-export LUA_CPATH_5_4="ARG_LUA_CPATH;${LUA_CPATH_5_4:-;}"
+export LUA_PATH_5_4="ARG_LUA_PATH;${LUA_PATH_5_4:-${LUA_PATH:-;}}"
+export LUA_CPATH_5_4="ARG_LUA_CPATH;${LUA_CPATH_5_4:-${LUA_CPATH:-;}}"
 export CARTESI_IMAGES_PATH="ARG_INSTALL_PATH"
 lua5.4 "ARG_LUA_RUNTIME_PATH/cartesi-machine-tests.lua" "$@"

tools/template/cartesi-machine.template

@@ -1,5 +1,5 @@
 #!/bin/sh
-export LUA_PATH_5_4="ARG_LUA_PATH;${LUA_PATH_5_4:-;}"
-export LUA_CPATH_5_4="ARG_LUA_CPATH;${LUA_CPATH_5_4:-;}"
+export LUA_PATH_5_4="ARG_LUA_PATH;${LUA_PATH_5_4:-${LUA_PATH:-;}}"
+export LUA_CPATH_5_4="ARG_LUA_CPATH;${LUA_CPATH_5_4:-${LUA_CPATH:-;}}"
 export CARTESI_IMAGES_PATH="${CARTESI_IMAGES_PATH:-ARG_IMAGES_PATH}"
 lua5.4 "ARG_LUA_RUNTIME_PATH/cartesi-machine.lua" "$@"

tools/template/rollup-memory-range.template

@@ -1,4 +1,4 @@
 #!/bin/sh
-export LUA_PATH_5_4="ARG_LUA_PATH;${LUA_PATH_5_4:-;}"
-export LUA_CPATH_5_4="ARG_LUA_CPATH;${LUA_CPATH_5_4:-;}"
+export LUA_PATH_5_4="ARG_LUA_PATH;${LUA_PATH_5_4:-${LUA_PATH:-;}}"
+export LUA_CPATH_5_4="ARG_LUA_CPATH;${LUA_CPATH_5_4:-${LUA_CPATH:-;}}"
 lua5.4 "ARG_LUA_RUNTIME_PATH/rollup-memory-range.lua" "$@"

tools/template/uarch-riscv-tests.template

@@ -1,4 +1,4 @@
 #!/bin/sh
-export LUA_PATH_5_4="ARG_LUA_PATH;${LUA_PATH_5_4:-;}"
-export LUA_CPATH_5_4="ARG_LUA_CPATH;${LUA_CPATH_5_4:-;}"
+export LUA_PATH_5_4="ARG_LUA_PATH;${LUA_PATH_5_4:-${LUA_PATH:-;}}"
+export LUA_CPATH_5_4="ARG_LUA_CPATH;${LUA_CPATH_5_4:-${LUA_CPATH:-;}}"
 lua5.4 "ARG_LUA_RUNTIME_PATH/uarch-riscv-tests.lua" "$@"