On Oct 10, 2014, at 11:13 AM, Lonnie Abelbeck <li...@lonnie.abelbeck.com> wrote:

> 
> On Oct 10, 2014, at 10:11 AM, Kim Alvefur <z...@zash.se> wrote:
> 
>> On fre 10 okt 2014 16:14:51, Lonnie Abelbeck <li...@lonnie.abelbeck.com> 
>> wrote:
>>> Then, since the Makefile uses "cp -r plugins/* $(MODULES)" the tarball
>>> directory permissions are copied over to the target.
>> 
>> But that line is prefixed with umask?
>> 
>> The real issue is that install, wich does the right thing, can't do 
>> recursive copying.
>> 
>> --
>> Kim "Zash" Alvefur
> 
> How about this...
> 
> --- prosody-0.9.5/Makefile.orig       2014-10-10 10:20:47.000000000 -0500
> +++ prosody-0.9.5/Makefile    2014-10-10 10:21:39.000000000 -0500
> @@ -37,7 +37,7 @@
>       install -m644 util/*.so $(SOURCE)/util
>       install -d $(SOURCE)/util/sasl
>       install -m644 util/sasl/* $(SOURCE)/util/sasl
> -     umask 0022 && cp -r plugins/* $(MODULES)
> +     cp -r plugins/* $(MODULES) && (find $(MODULES) -type f -print0 | xargs 
> -0 chmod 644 ; find $(MODULES) -type d -print0 | xargs -0 chmod 755)
>       install -m644 certs/* $(CONFIG)/certs
>       install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
>       test -e $(CONFIG)/prosody.cfg.lua || install -m644 
> prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua
> 
> 
> Lonnie

Hi Zash, you may like this solution better, it works in my tests...

--- prosody-0.9.5/Makefile.orig 2014-10-10 10:20:47.000000000 -0500
+++ prosody-0.9.5/Makefile      2014-10-10 10:21:39.000000000 -0500
@@ -37,7 +37,7 @@
        install -m644 util/*.so $(SOURCE)/util
        install -d $(SOURCE)/util/sasl
        install -m644 util/sasl/* $(SOURCE)/util/sasl
-       umask 0022 && cp -r plugins/* $(MODULES)
+       ( cd plugins ; find . -type f -exec install -D -m644 '{}' 
$(MODULES)/'{}' \; )
        install -m644 certs/* $(CONFIG)/certs
        install -m644 man/prosodyctl.man $(MAN)/man1/prosodyctl.1
        test -e $(CONFIG)/prosody.cfg.lua || install -m644 
prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua

Lonnie

-- 
You received this message because you are subscribed to the Google Groups 
"prosody-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to prosody-dev+unsubscr...@googlegroups.com.
To post to this group, send email to prosody-dev@googlegroups.com.
Visit this group at http://groups.google.com/group/prosody-dev.
For more options, visit https://groups.google.com/d/optout.

Reply via email to