support new dir structure
Costa Tsaousis (ktsaou) committed
Mar 16, 2015 at 19:11 UTC
ee3fe3fe932f6c9ca3591c5fc525d2ef381219b3
1 file changed
+14
-5
netdata.start
+14
-5
@@ -19,7 +19,7 @@ NETDATA_CONFIG_INTERNAL_HISTORY_LINES=3600
19
NETDATA_CONFIG_USER=nobody
20
21
# set to 1, to enable debugging
22
-NETDATA_CONFIG_DEBUG=0
22
+NETDATA_CONFIG_DEBUG=1
23
24
# our port
25
NETDATA_CONFIG_PORT=19999
@@ -43,9 +43,9 @@ then
43
# find the user to run as
44
x="`grep 'run as user = ' $NETDATA_CONFIG_CONF_DIR/netdata.conf | head -n 1 | cut -d '=' -f 2 | sed s"/ //g"`"
45
test ! -z "$x" && NETDATA_CONFIG_USER="$x"
46
-
46
+
47
x="`grep 'web files directory = ' $NETDATA_CONFIG_CONF_DIR/netdata.conf | head -n 1 | cut -d '=' -f 2 | sed -e s"/^ \+//g" -e s"/ \+$//g"`"
48
- test ! -z "$x" && NETDATA_CONFIG_WEB_DIR="$x"
48
+ test ! -z "$x" && NETDATA_CONFIG_WEB_DIR="$x"
49
fi
50
51
for x in "$NETDATA_CONFIG_WEB_DIR" "$NETDATA_CONFIG_CONF_DIR" "$NETDATA_CONFIG_CACHE_DIR" "$NETDATA_CONFIG_LOG_DIR"
@@ -60,12 +60,21 @@ echo "Compiling netdata (debug=$NETDATA_CONFIG_DEBUG)"
60
if [ $NETDATA_CONFIG_DEBUG -eq 1 ]
61
then
62
ulimit -c unlimited
63
- make debug=1 || exit 1
63
+ cd src || exit 1
64
+ make || exit 1
65
+ cd plugins.d || exit 1
66
+ make || exit 1
67
debug_opts="-df 0xfffffadf"
68
else
66
- make || exit 1
69
+ cd src || exit 1
70
+ make final=1 || exit 1
71
+ cd plugins.d || exit 1
72
+ make final=1 || exit 1
73
debug_opts="-df 0x00000000"
74
fi
75
+cd ../../ || exit 1
76
+mv src/netdata ./ || exit 1
77
+mv src/plugins.d/apps.plugin plugins.d/ || exit 1
78
79
echo "Stopping a (possibly) running netdata..."
80
ret=0