diff options
| author | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-11-20 18:56:28 +0700 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2018-11-24 12:35:24 +0700 |
| commit | c48eac5b370c22867facc92e8a6bc6ff5d99d285 (patch) | |
| tree | 3005a4463424aaf7cd42ebff69feacd616ab535c | |
| parent | e897ed241d838a36335ed61f644992e863f8dc2f (diff) | |
system/netdata: Fix doinst.sh script.
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
| -rw-r--r-- | system/netdata/doinst.sh | 18 | ||||
| -rw-r--r-- | system/netdata/netdata.SlackBuild | 12 |
2 files changed, 20 insertions, 10 deletions
diff --git a/system/netdata/doinst.sh b/system/netdata/doinst.sh index 65dbb24ba0e99..880b643590f6f 100644 --- a/system/netdata/doinst.sh +++ b/system/netdata/doinst.sh @@ -24,22 +24,32 @@ preserve_perms() { config etc/netdata/netdata.conf.new -for L in `ls etc/netdata/*.new` +for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/*.new` do config $L done -for L in `ls etc/netdata/python.d/*.new` +for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/python.d/*.new` do config $L done -for L in `ls etc/netdata/charts.d/*.new` +for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/charts.d/*.new` do config $L done -for L in `ls etc/netdata/health.d/*.new` +for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/health.d/*.new` +do +config $L +done + +#for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/node.d/*.new` +#do +#config $L +#done + +for L in `ls usr/lib%LIBDIRSUFFIX%/netdata/conf.d/statsd.d/*.new` do config $L done diff --git a/system/netdata/netdata.SlackBuild b/system/netdata/netdata.SlackBuild index 680340fb4654f..6ecff625c1573 100644 --- a/system/netdata/netdata.SlackBuild +++ b/system/netdata/netdata.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=netdata VERSION=${VERSION:-1.11.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} NETDATA_USER=${NETDATA_USER:-netdata} @@ -148,10 +148,10 @@ do mv $L $L.new done -for L in `ls $PKG/usr/lib${LIBDIRSUFFIX}/netdata/conf.d/node.d/*.conf` -do -mv $L $L.new -done +#for L in `ls $PKG/usr/lib${LIBDIRSUFFIX}/netdata/conf.d/node.d/*.conf` +#do +#mv $L $L.new +#done for L in `ls $PKG/usr/lib${LIBDIRSUFFIX}/netdata/conf.d/statsd.d/*.conf` do @@ -160,7 +160,7 @@ done mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh +sed -e s/%LIBDIRSUFFIX%/$LIBDIRSUFFIX/g $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} |