fixes
Costa Tsaousis (ktsaou) committed
May 20, 2014 at 03:57 UTC
e33aaa99324e07eb9b055deab07f5f3a0749dd89
2 files changed
+14
-7
Makefile
+13
-6
@@ -28,12 +28,19 @@ plugins.d/apps.plugin: apps_plugin.c
28
@echo
29
@echo "Compiling apps.plugin..."
30
$(CC) $(CFLAGS) -o plugins.d/apps.plugin apps_plugin.c
31
- @echo
32
- @echo " >>> apps.plugin requires root access to access files in /proc"
33
- @echo " >>> Please authorize it!"
34
- @echo
35
- -sudo chown root plugins.d/apps.plugin
36
- -sudo chmod 4775 plugins.d/apps.plugin
31
+ @-if [ ! "$$USER" = "root" ]; \
32
+ then \
33
+ echo; \
34
+ echo " >>> apps.plugin requires root access to access files in /proc"; \
35
+ echo " >>> Please authorize it!"; \
36
+ echo; \
37
+ sudo chown root plugins.d/apps.plugin; \
38
+ sudo chmod 4775 plugins.d/apps.plugin; \
39
+ else \
40
+ chown root plugins.d/apps.plugin; \
41
+ chmod 4775 plugins.d/apps.plugin; \
42
+ fi
43
+
44
45
clean:
46
-rm -f *.o netdata plugins.d/apps.plugin core
netdata.start
+1
-1
@@ -84,7 +84,7 @@ if [ "$USER" = "root" -a ! -z "$NETDATA_CONFIG_USER" ]
84
then
85
for x in "$NETDATA_CONFIG_WEB_DIR" "$NETDATA_CONFIG_CONF_DIR" "$NETDATA_CONFIG_CACHE_DIR" "$NETDATA_CONFIG_LOG_DIR"
86
do
87
- echo "Chaning ownership of web files in $x to $NETDATA_CONFIG_USER"
87
+ echo "Changing ownership of web files in $x to $NETDATA_CONFIG_USER"
88
chown -R "$NETDATA_CONFIG_USER" "$x" || exit 1
89
chmod 0775 "$x" $NETDATA_CONFIG_CONF_DIR log cache || exit 1
90
done