tjh.dev
1diff --git a/accountd/Makefile b/accountd/Makefile
2index c3e8107..7946776 100644
3--- a/accountd/Makefile
4+++ b/accountd/Makefile
5@@ -75,6 +75,6 @@ clean:
6 -rm -f prayer-accountd test core *.o *~ \#*\#
7
8 install:
9- $(INSTALL) -m 755 -o ${RO_USER} -g ${RW_GROUP} \
10+ $(INSTALL) -m 755 \
11 prayer-accountd ${BROOT}${BIN_DIR}
12
13diff --git a/files/Makefile b/files/Makefile
14index 743d0ed..7eff064 100644
15--- a/files/Makefile
16+++ b/files/Makefile
17@@ -52,20 +52,20 @@ distclean:
18
19 install-cert:
20 if [ -f certs/prayer.pem ]; then \
21- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) \
22+ $(INSTALL) \
23 -m $(PRIVATE_FILE) certs/prayer.pem ${BROOT}${PREFIX}/certs; \
24 fi
25
26 install-config: etc/prayer.cf
27- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
28+ $(INSTALL) -D -m $(PUBLIC_FILE) \
29 etc/prayer.cf ${BROOT}${PRAYER_CONFIG_FILE}
30
31 install-aconfig:
32- $(INSTALL) -D -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
33+ $(INSTALL) -D -m $(PUBLIC_FILE) \
34 etc/prayer-accountd.cf ${BROOT}${ACCOUNTD_CONFIG_FILE}
35
36 install-motd:
37- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_FILE) \
38+ $(INSTALL) -m $(PUBLIC_FILE) \
39 etc/motd.html ${BROOT}${PREFIX}/etc
40
41 install:
42@@ -83,6 +83,6 @@ install:
43 if [ ! -f $(BROOT)$(PREFIX)/etc/motd.html ]; then $(MAKE) install-motd; fi
44
45 redhat-install-init.d:
46- install -D -o root -g root -m 755 \
47+ install -D -m 755 \
48 ./init.d/prayer $(BROOT)/etc/rc.d/init.d/prayer
49 #chkconfig prayer --level 2345 on
50diff --git a/files/install.sh b/files/install.sh
51index 8d1d1f4..0804a08 100755
52--- a/files/install.sh
53+++ b/files/install.sh
54@@ -2,8 +2,6 @@
55 #
56 # $Cambridge: hermes/src/prayer/files/install.sh,v 1.7 2008/09/16 09:59:56 dpc22 Exp $
57
58-PATH=/bin:/sbin/:/usr/bin:/usr/sbin
59-
60 error=0
61
62 if [ "x$PREFIX" = "x" ]; then
63@@ -55,24 +53,20 @@ if [ $error != 0 ]; then
64 exit 1
65 fi
66
67-if [ ! -d ${VAR_PREFIX} -a `whoami` = "root" ]; then
68- ${INSTALL} -d -o ${RW_USER} -g ${RW_GROUP} -m ${PRIVATE_DIR} ${VAR_PREFIX}
69-fi
70-
71 if [ ! -d ${PREFIX} ]; then
72- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}
73+ ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}
74 fi
75
76 if [ ! -d ${PREFIX}/etc ]; then
77- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${PREFIX}/etc
78+ ${INSTALL} -d -m ${PUBLIC_DIR} ${PREFIX}/etc
79 fi
80
81 if [ ! -d ${PREFIX}/certs ]; then
82- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PRIVATE_DIR} ${PREFIX}/certs
83+ ${INSTALL} -d -m ${PRIVATE_DIR} ${PREFIX}/certs
84 fi
85
86 if [ ! -d ${BIN_DIR} ]; then
87- ${INSTALL} -d -o ${RO_USER} -g ${RO_GROUP} -m ${PUBLIC_DIR} ${BIN_DIR}
88+ ${INSTALL} -d -m ${PUBLIC_DIR} ${BIN_DIR}
89 fi
90
91 for i in icons static
92@@ -83,5 +77,4 @@ do
93 fi
94 echo Copying ${i}
95 (tar cf - ${i}) | (cd ${PREFIX} ; tar xf -)
96- (cd ${PREFIX}; chown -R ${RO_USER}:${RO_GROUP} ${i})
97 done
98diff --git a/servers/Makefile b/servers/Makefile
99index 021aed5..5ccbd08 100644
100--- a/servers/Makefile
101+++ b/servers/Makefile
102@@ -107,13 +107,13 @@ clean:
103 -rm -f $(BIN) core *.o *.flc *~ \#*\#
104
105 install: all
106- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
107+ $(INSTALL) -m $(PUBLIC_DIR) -d \
108 $(BROOT)$(BIN_DIR)
109- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
110+ $(INSTALL) -m $(PUBLIC_EXEC) \
111 prayer $(BROOT)$(BIN_DIR)
112- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
113+ $(INSTALL) -m $(PUBLIC_EXEC) \
114 prayer-chroot $(BROOT)$(BIN_DIR)
115- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
116+ $(INSTALL) -m $(PUBLIC_EXEC) \
117 prayer-session $(BROOT)$(BIN_DIR)
118
119 prayer: $(PRAYER_OBJS) prayer_main.o
120diff --git a/templates/cam/Makefile b/templates/cam/Makefile
121index 9f4122a..396b628 100644
122--- a/templates/cam/Makefile
123+++ b/templates/cam/Makefile
124@@ -124,7 +124,7 @@ _template_index.c:
125 $(COMPILE) $(TYPE) $@ $*
126
127 install:
128- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
129+ $(INSTALL) -m $(PUBLIC_DIR) -d \
130 $(BROOT)$(PREFIX)/templates/$(TYPE)
131 cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)
132 cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
133diff --git a/templates/old/Makefile b/templates/old/Makefile
134index 31016cf..288a64c 100644
135--- a/templates/old/Makefile
136+++ b/templates/old/Makefile
137@@ -123,7 +123,7 @@ _template_index.c:
138 $(COMPILE) $(TYPE) $@ $*
139
140 install:
141- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
142+ $(INSTALL) -m $(PUBLIC_DIR) -d \
143 $(BROOT)$(PREFIX)/templates/$(TYPE)
144 cp *.t $(BROOT)$(PREFIX)/templates/$(TYPE)
145 cp *.vars $(BROOT)$(PREFIX)/templates/$(TYPE)
146diff --git a/utils/Makefile b/utils/Makefile
147index 9c79916..ef82481 100644
148--- a/utils/Makefile
149+++ b/utils/Makefile
150@@ -72,15 +72,15 @@ clean:
151 -rm -f $(BIN) core *.o *.flc *~ \#*\#
152
153 install: all
154- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_DIR) -d \
155+ $(INSTALL) -m $(PUBLIC_DIR) -d \
156 $(BROOT)$(BIN_DIR)
157- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
158+ $(INSTALL) -m $(PUBLIC_EXEC) \
159 prayer-ssl-prune $(BROOT)$(BIN_DIR)
160- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
161+ $(INSTALL) -m $(PUBLIC_EXEC) \
162 prayer-sem-prune $(BROOT)$(BIN_DIR)
163- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
164+ $(INSTALL) -m $(PUBLIC_EXEC) \
165 prayer-db-prune $(BROOT)$(BIN_DIR)
166- $(INSTALL) -o $(RO_USER) -g $(RO_GROUP) -m $(PUBLIC_EXEC) \
167+ $(INSTALL) -m $(PUBLIC_EXEC) \
168 prayer-cyclog $(BROOT)$(BIN_DIR)
169
170 prayer-ssl-prune: $(PRUNE_OBJS)