Skip to content

Commit 113f8f1

Browse files
author
Mark Morga
committed
Fix for OCSIGENGROUP groups with spaces in the name
This addresses issue #101 For each impacted Makefile, references to $(OCSIGENGROUP) have been replaced with “$(OCSIGENGROUP)”.
1 parent 8cff792 commit 113f8f1

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ install.opt: install.META.opt install.files
6868
# BB If install is not run by root but OCSIGENUSER, OCSIGENGROUP is somebody
6969
# BB different, make files universally accessible, we cannot chown.
7070
INSTALL_CAN_PUT_PERMISSIONS=yes
71-
INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g $(OCSIGENGROUP)
71+
INSTALL_USER_GROUP=-o $(OCSIGENUSER) -g "$(OCSIGENGROUP)"
7272
INSTALL_MOD_660=660
7373
INSTALL_MOD_644=644
7474
INSTALL_MOD_755=755
@@ -99,7 +99,7 @@ install.files:
9999
[ -p $(TEMPROOT)$(COMMANDPIPE) ] || \
100100
{ mkfifo -m ${INSTALL_MOD_660} $(TEMPROOT)$(COMMANDPIPE); \
101101
if [ "${INSTALL_CAN_PUT_PERMISSIONS}" = yes ]; \
102-
then $(CHOWN) -R $(OCSIGENUSER):$(OCSIGENGROUP) $(TEMPROOT)$(COMMANDPIPE); \
102+
then $(CHOWN) -R $(OCSIGENUSER):"$(OCSIGENGROUP)" $(TEMPROOT)$(COMMANDPIPE); \
103103
fi; }
104104
## Configuration files
105105
$(INSTALL) -m ${INSTALL_MOD_755} -d $(TEMPROOT)$(CONFIGDIR)/conf.d
@@ -162,7 +162,7 @@ logrotate:
162162
cat src/files/logrotate.in \
163163
| sed s%LOGDIR%$(LOGDIR)%g \
164164
| sed s%USER%$(OCSIGENUSER)%g \
165-
| sed s%GROUP%$(OCSIGENGROUP)%g \
165+
| sed s%GROUP%"$(OCSIGENGROUP)"%g \
166166
| sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
167167
> $(TEMPROOT)/etc/logrotate.d/$(PROJECTNAME)
168168

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ confs: ../$(PROJECTNAME).conf.sample ../local/etc/${PROJECTNAME}.conf
5151
| sed s%_LOGDIR_%$(LOGDIR)%g \
5252
| sed s%_DATADIR_%$(DATADIR)%g \
5353
| sed s%_OCSIGENUSER_%$(OCSIGENUSER)%g \
54-
| sed s%_OCSIGENGROUP_%$(OCSIGENGROUP)%g \
54+
| sed s%_OCSIGENGROUP_%"$(OCSIGENGROUP)"%g \
5555
| sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
5656
| sed s%_MIMEFILE_%$(CONFIGDIR)/mime.types%g \
5757
| sed s%_METADIR_%$(LIBDIR)%g \

src/baselib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ ocsigen_config.ml: ocsigen_config.ml.in ../../Makefile.config ../../Makefile.opt
7373
| sed s%_STATICPAGESDIR_%$(STATICPAGESDIR)% \
7474
| sed s%_UP_%$(UPLOADDIR)%g \
7575
| sed s%_OCSIGENUSER_%$(OCSIGENUSER)%g \
76-
| sed s%_OCSIGENGROUP_%$(OCSIGENGROUP)%g \
76+
| sed s%_OCSIGENGROUP_%"$(OCSIGENGROUP)"%g \
7777
| sed s%_PROJECTNAME_%$(PROJECTNAME)%g \
7878
| sed s%_COMMANDPIPE_%$(COMMANDPIPE)%g \
7979
| sed s%_CONFIGDIR_%$(CONFIGDIR)% \

0 commit comments

Comments
 (0)