# # # patch "contrib/mtn_makepermissions" # from [d8d40dbb0496c9e22f7c57038fa610bea8ed940a] # to [765d61b2f8eb36791c107b2b390ebdd0e3c21c79] # ============================================================ --- contrib/mtn_makepermissions d8d40dbb0496c9e22f7c57038fa610bea8ed940a +++ contrib/mtn_makepermissions 765d61b2f8eb36791c107b2b390ebdd0e3c21c79 @@ -48,14 +48,19 @@ for my $d (("read-permissions", "write-p for my $d (("read-permissions", "write-permissions")) { if (opendir D,catdir($user_config,$d.".d")) { if (open OUT_PERM,">".catdir($user_config,$d)) { - foreach my $d2 (readdir D) { - open IN_PERM,catfile($user_config,$d.".d",$d2); - while () { - print OUT_PERM $_; + my %lines = (); + foreach my $d2 (sort readdir D) { + # Skip over file names starting with ., following Unix standards + if ( $d2 !~ m/^\./ ) { + open IN_PERM,catfile($user_config,$d.".d",$d2); + while () { + chomp; + $lines{$_} = 1; + } + close IN_PERM; } - print OUT_PERM "\n"; - close IN_PERM; } + print OUT_PERM join("\n", sort keys %lines), "\n"; close OUT_PERM; } closedir D;