Merge pull request #11560 from zmstone/0904-fix-nodetool-patches-dir

fix(nodetool): ensure patches dir added for rpm/deb installs

bin/nodetool

@@ -358,7 +358,10 @@ add_libs_dir() ->
             %% rel file was been deleted by release handler
             error({failed_to_read_RELEASES_file, RelFile, Reason})
     end,
-    PatchesDir = filename:join([RootDir, "data", "patches"]),
+    ok = add_patches_dir(filename:join([RootDir, "data", "patches"])),
+    ok = add_patches_dir("/var/lib/emqx/patches").
+
+add_patches_dir(PatchesDir) ->
     case filelib:is_dir(PatchesDir) of
         true ->
             true = code:add_patha(PatchesDir),

deploy/packages/deb/debian/rules

@@ -36,8 +36,6 @@ install: build
 	mkdir -p debian/emqx/usr/lib/emqx/bin
 	mkdir -p debian/emqx/usr/lib/emqx/plugins
 	touch debian/emqx/usr/lib/emqx/plugins/.keep
-	mkdir -p debian/emqx/usr/lib/emqx/data/patches
-	touch debian/emqx/usr/lib/emqx/data/patches/.keep
 	mkdir -p debian/emqx/etc/emqx
 	cp bin/* debian/emqx/usr/lib/emqx/bin
 	cp -R lib debian/emqx/usr/lib/emqx

deploy/packages/rpm/emqx.spec

@@ -40,7 +40,6 @@ EMQX, a distributed, massively scalable, highly extensible MQTT message broker.
 %install
 mkdir -p %{buildroot}%{_lib_home}
 mkdir -p %{buildroot}%{_lib_home}/plugins
-mkdir -p %{buildroot}%{_lib_home}/data/patches
 mkdir -p %{buildroot}%{_log_dir}
 mkdir -p %{buildroot}%{_unitdir}
 mkdir -p %{buildroot}%{_conf_dir}
@@ -49,7 +48,6 @@ mkdir -p %{buildroot}%{_var_home}
 
 cp -R %{_reldir}/lib %{buildroot}%{_lib_home}/
 touch %{buildroot}%{_lib_home}/plugins/.keep
-touch %{buildroot}%{_lib_home}/data/patches/.keep
 cp -R %{_reldir}/erts-* %{buildroot}%{_lib_home}/
 cp -R %{_reldir}/releases %{buildroot}%{_lib_home}/
 cp -R %{_reldir}/bin %{buildroot}%{_lib_home}/