[enhancement] Make lib modules as non-executable #60

Closes #60
openwisp · Aug 16, 2021 · 90d6fb2 · 90d6fb2
1 parent 3740362
commit 90d6fb2
Show file tree

Hide file tree

Showing 16 changed files with 46 additions and 48 deletions.
diff --git a/openwrt-openwisp-monitoring/Makefile b/openwrt-openwisp-monitoring/Makefile
@@ -51,39 +51,39 @@ endef
 define Package/netjson-monitoring/install
 	$(INSTALL_DIR) \
 		$(1)/usr/sbin \
-		$(1)/usr/lib/lua/openwisp
+		$(1)/usr/lib/lua/openwisp_monitoring
 
 	$(INSTALL_BIN) \
 		files/sbin/netjson-monitoring.lua \
 		$(1)/usr/sbin/netjson_monitoring
 
-	$(INSTALL_BIN) \
-		files/lib/openwisp/dhcp.lua \
-		$(1)/usr/lib/lua/openwisp/dhcp.lua
+	$(INSTALL_DATA) \
+		files/lib/openwisp_monitoring/dhcp.lua \
+		$(1)/usr/lib/lua/openwisp_monitoring/dhcp.lua
 
-	$(INSTALL_BIN) \
-		files/lib/openwisp/interfaces.lua \
-		$(1)/usr/lib/lua/openwisp/interfaces.lua
+	$(INSTALL_DATA) \
+		files/lib/openwisp_monitoring/interfaces.lua \
+		$(1)/usr/lib/lua/openwisp_monitoring/interfaces.lua
 
-	$(INSTALL_BIN) \
-		files/lib/openwisp/monitoring.lua \
-		$(1)/usr/lib/lua/openwisp/monitoring.lua
+	$(INSTALL_DATA) \
+		files/lib/openwisp_monitoring/monitoring.lua \
+		$(1)/usr/lib/lua/openwisp_monitoring/monitoring.lua
 
-	$(INSTALL_BIN) \
-		files/lib/openwisp/monitoring_utils.lua \
-		$(1)/usr/lib/lua/openwisp/monitoring_utils.lua
+	$(INSTALL_DATA) \
+		files/lib/openwisp_monitoring/utils.lua \
+		$(1)/usr/lib/lua/openwisp_monitoring/utils.lua
 
-	$(INSTALL_BIN) \
-		files/lib/openwisp/neighbors.lua \
-		$(1)/usr/lib/lua/openwisp/neighbors.lua
+	$(INSTALL_DATA) \
+		files/lib/openwisp_monitoring/neighbors.lua \
+		$(1)/usr/lib/lua/openwisp_monitoring/neighbors.lua
 
-	$(INSTALL_BIN) \
-		files/lib/openwisp/resources.lua \
-		$(1)/usr/lib/lua/openwisp/resources.lua
+	$(INSTALL_DATA) \
+		files/lib/openwisp_monitoring/resources.lua \
+		$(1)/usr/lib/lua/openwisp_monitoring/resources.lua
 
-	$(INSTALL_BIN) \
-		files/lib/openwisp/wifi.lua \
-		$(1)/usr/lib/lua/openwisp/wifi.lua
+	$(INSTALL_DATA) \
+		files/lib/openwisp_monitoring/wifi.lua \
+		$(1)/usr/lib/lua/openwisp_monitoring/wifi.lua
 
 endef
 

diff --git a/openwrt-openwisp-monitoring/files/lib/openwisp/monitoring.lua b/openwrt-openwisp-monitoring/files/lib/openwisp/monitoring.lua
diff --git a/...sp-monitoring/files/lib/openwisp/dhcp.lua → ...ng/files/lib/openwisp_monitoring/dhcp.lua b/...sp-monitoring/files/lib/openwisp/dhcp.lua → ...ng/files/lib/openwisp_monitoring/dhcp.lua
@@ -1,7 +1,5 @@
-package.path=package.path .. ";../files/lib/?.lua"
-
 -- retrieve dhcp leases
-local utils=require('openwisp.monitoring_utils')
+local utils=require('openwisp_monitoring.utils')
 local uci=require('uci')
 local uci_cursor=uci.cursor()
 local io=require('io')

diff --git a/...itoring/files/lib/openwisp/interfaces.lua → ...es/lib/openwisp_monitoring/interfaces.lua b/...itoring/files/lib/openwisp/interfaces.lua → ...es/lib/openwisp_monitoring/interfaces.lua
@@ -1,5 +1,5 @@
 -- retrieve interfaces information
-local utils=require('openwisp.monitoring_utils')
+local utils=require('openwisp_monitoring.utils')
 
 local cjson=require('cjson')
 local nixio=require('nixio')

diff --git a/openwrt-openwisp-monitoring/files/lib/openwisp_monitoring/monitoring.lua b/openwrt-openwisp-monitoring/files/lib/openwisp_monitoring/monitoring.lua
@@ -0,0 +1,12 @@
+package.path=package.path .. ";../files/lib/?.lua"
+
+local monitoring={}
+
+monitoring.dhcp=require('openwisp_monitoring.dhcp')
+monitoring.interfaces=require('openwisp_monitoring.interfaces')
+monitoring.neighbors=require('openwisp_monitoring.neighbors')
+monitoring.resources=require('openwisp_monitoring.resources')
+monitoring.utils=require('openwisp_monitoring.utils')
+monitoring.wifi=require('openwisp_monitoring.wifi')
+
+return monitoring
diff --git a/...nitoring/files/lib/openwisp/neighbors.lua → ...les/lib/openwisp_monitoring/neighbors.lua b/...nitoring/files/lib/openwisp/neighbors.lua → ...les/lib/openwisp_monitoring/neighbors.lua
@@ -1,7 +1,7 @@
 -- retrieve neighbors information
 local cjson=require('cjson')
 local io=require('io')
-local utils=require('openwisp.monitoring_utils')
+local utils=require('openwisp_monitoring.utils')
 
 local neighbors={}
 

diff --git a/...nitoring/files/lib/openwisp/resources.lua → ...les/lib/openwisp_monitoring/resources.lua b/...nitoring/files/lib/openwisp/resources.lua → ...les/lib/openwisp_monitoring/resources.lua
@@ -1,6 +1,6 @@
 -- retrieve resources usage
 local io=require('io')
-local utils=require('openwisp.monitoring_utils')
+local utils=require('openwisp_monitoring.utils')
 
 local resources={}
 

diff --git a/...g/files/lib/openwisp/monitoring_utils.lua → ...g/files/lib/openwisp_monitoring/utils.lua b/...g/files/lib/openwisp/monitoring_utils.lua → ...g/files/lib/openwisp_monitoring/utils.lua
diff --git a/...sp-monitoring/files/lib/openwisp/wifi.lua → ...ng/files/lib/openwisp_monitoring/wifi.lua b/...sp-monitoring/files/lib/openwisp/wifi.lua → ...ng/files/lib/openwisp_monitoring/wifi.lua
diff --git a/openwrt-openwisp-monitoring/files/sbin/netjson-monitoring.lua b/openwrt-openwisp-monitoring/files/sbin/netjson-monitoring.lua
@@ -12,7 +12,7 @@ if not ubus then
   error('Failed to connect to ubusd')
 end
 
-local monitoring=require('openwisp.monitoring')
+local monitoring=require('openwisp_monitoring.monitoring')
 
 -- collect system info
 local system_info=ubus:call('system', 'info', {})

diff --git a/openwrt-openwisp-monitoring/tests/test_dhcp.lua b/openwrt-openwisp-monitoring/tests/test_dhcp.lua
@@ -1,4 +1,4 @@
-package.path=package.path .. ";../files/lib/openwisp/?.lua;../files/sbin/?.lua"
+package.path=package.path .. ";../files/lib/openwisp_monitoring/?.lua;../files/sbin/?.lua"
 
 local dhcp_data=require('test_files/dhcp_data')
 

diff --git a/openwrt-openwisp-monitoring/tests/test_interfaces.lua b/openwrt-openwisp-monitoring/tests/test_interfaces.lua
@@ -1,4 +1,4 @@
-package.path=package.path .. ";../files/lib/openwisp/?.lua"
+package.path=package.path .. ";../files/lib/openwisp_monitoring/?.lua"
 
 local luaunit=require('luaunit')
 

diff --git a/openwrt-openwisp-monitoring/tests/test_neighbors.lua b/openwrt-openwisp-monitoring/tests/test_neighbors.lua
@@ -1,4 +1,4 @@
-package.path=package.path .. ";../files/lib/openwisp/?.lua;../files/sbin/?.lua"
+package.path=package.path .. ";../files/lib/openwisp_monitoring/?.lua;../files/sbin/?.lua"
 
 local luaunit=require('luaunit')
 

diff --git a/openwrt-openwisp-monitoring/tests/test_resources.lua b/openwrt-openwisp-monitoring/tests/test_resources.lua
@@ -1,4 +1,4 @@
-package.path=package.path .. ";../files/lib/openwisp/?.lua;../files/sbin/?.lua"
+package.path=package.path .. ";../files/lib/openwisp_monitoring/?.lua;../files/sbin/?.lua"
 
 local luaunit=require('luaunit')
 

diff --git a/openwrt-openwisp-monitoring/tests/test_utils.lua b/openwrt-openwisp-monitoring/tests/test_utils.lua
@@ -1,8 +1,8 @@
-package.path=package.path .. ";../files/lib/openwisp/?.lua"
+package.path=package.path .. ";../files/lib/openwisp_monitoring/?.lua"
 
 local luaunit=require('luaunit')
 
-local utils=require('monitoring_utils')
+local utils=require('utils')
 
 TestUtils={}
 

diff --git a/openwrt-openwisp-monitoring/tests/test_wifi.lua b/openwrt-openwisp-monitoring/tests/test_wifi.lua
@@ -1,4 +1,4 @@
-package.path=package.path .. ";../files/lib/openwisp/?.lua;../files/sbin/?.lua"
+package.path=package.path .. ";../files/lib/openwisp_monitoring/?.lua;../files/sbin/?.lua"
 
 local wifi_data=require('test_files/wireless_data')
 local luaunit=require('luaunit')