From e01e004a95dcc60f5cb496d4f016affc9d3d72b8 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Sat, 18 Jun 2016 16:09:43 -0700
Subject: Produce sorted .perms

---
 setup.rc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'setup.rc')

diff --git a/setup.rc b/setup.rc
index 300b9f40..1a11cb16 100755
--- a/setup.rc
+++ b/setup.rc
@@ -49,11 +49,11 @@ fn gen {
 		phony ninja '$dir/local.ninja' $gen_inputs
 
 		if(! ~ $#tree_perms 0) {
-			printf '%s\n' $tree_perms >$absdir/local.perms
+			printf '%s\n' $tree_perms | sort >$absdir/local.perms
 			perms_inputs=($perms_inputs '$dir'/local.perms)
 		}
 		if(~ $#perms_inputs 0) build '$outdir/root.perms' empty
-		if not build '$outdir/root.perms' cat $perms_inputs
+		if not build '$outdir/root.perms' mergeperms $perms_inputs
 		if(~ $#tree_inputs 0) build '$outdir/root.tree' empty
 		if not build '$outdir/root.tree' cat $tree_inputs
 	} >local.ninja.tmp
-- 
cgit v1.2.3