From 0d4f034146ff28875b2c01cf37583c975afb951b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nagy=20K=C3=A1roly=20G=C3=A1briel?= <k@jpi.io>
Date: Mon, 18 Mar 2019 15:56:01 +0200
Subject: [PATCH] fluxplug: sanitize the way path are obtained
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Nagy Károly Gábriel <k@jpi.io>
---
 master                                     | 4 ++--
 chrony.sh => plugins-available/chrony.sh   | 9 ++++++---
 disks.sh => plugins-available/disks.sh     | 9 ++++++---
 loadavg.sh => plugins-available/loadavg.sh | 9 ++++++---
 meminfo.sh => plugins-available/meminfo.sh | 9 ++++++---
 packs.sh => plugins-available/packs.sh     | 9 ++++++---
 plugins-enabled/.keep                      | 0
 7 files changed, 32 insertions(+), 17 deletions(-)
 rename chrony.sh => plugins-available/chrony.sh (79%)
 rename disks.sh => plugins-available/disks.sh (72%)
 rename loadavg.sh => plugins-available/loadavg.sh (72%)
 rename meminfo.sh => plugins-available/meminfo.sh (80%)
 rename packs.sh => plugins-available/packs.sh (76%)
 create mode 100644 plugins-enabled/.keep

diff --git a/master b/master
index fbfa6d3..627db1a 100644
--- a/master
+++ b/master
@@ -10,8 +10,8 @@ CHRONY="/usr/bin/chronyc -nc tracking"
 z=$(basename $0)
 IAM="${z%.*}"
 
-tmpfile="$HOME"/tmp/"$IAM"
-datafile="$HOME"/data/"$IAM"
+tmpfile="$FLUXPLUGHOME"/tmp/"$IAM"
+datafile="$FLUXPLUGHOME"/data/"$IAM"
 
 MAXLINES=10
 
diff --git a/chrony.sh b/plugins-available/chrony.sh
similarity index 79%
rename from chrony.sh
rename to plugins-available/chrony.sh
index 19bdb26..aecd3f6 100755
--- a/chrony.sh
+++ b/plugins-available/chrony.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
 
 set -o noclobber
-
-HOME=$(dirname $0)
-. "$HOME"/master
+old=$PWD
+cd $(dirname $(readlink -f "$0"))
+cd ../
+FLUXPLUGHOME=$PWD
+. "$FLUXPLUGHOME"/master
+cd $old
 
 LINE=$($CHRONY | "$AWK" -F"," -v myhost="$myhost" -v time=`date -u +%s%N` '{printf "chrony,host=%s,reference_id=%s,stratum=%si,leap_status=%s system_time=%s,last_offset=%s,rms_offset=%s,frequency=%s,residual_frequency=%s,skew=%s,root_delay=%s,root_dispersion=%s,update_interval=%s  %s\n",myhost,$2,$3,$13,$4,$5,$6,$7,$8,$9,$10,$11,$12,time}')
 
diff --git a/disks.sh b/plugins-available/disks.sh
similarity index 72%
rename from disks.sh
rename to plugins-available/disks.sh
index 369041c..8b75f87 100755
--- a/disks.sh
+++ b/plugins-available/disks.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
 
 set -o noclobber
-
-HOME=$(dirname $0)
-. "$HOME"/master
+old=$PWD
+cd $(dirname $(readlink -f "$0")
+cd ../
+FLUXPLUGHOME=$PWD
+. "$FLUXPLUGHOME"/master
+cd $old
 
 LINE=$($DF | $SED | "$AWK" -v myhost="$myhost" -v time=`date -u +%s%N` '{sub(/\%$/,"",$5);printf "disks,host=%s,disk=%s total=%s,available=%s,used=%s,percent=%s %s\n",myhost,$1,$2,$4,$3,$5,time}')
 
diff --git a/loadavg.sh b/plugins-available/loadavg.sh
similarity index 72%
rename from loadavg.sh
rename to plugins-available/loadavg.sh
index 388a281..c7b470f 100755
--- a/loadavg.sh
+++ b/plugins-available/loadavg.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
 
 set -o noclobber
-
-HOME=$(dirname $0)
-. "$HOME"/master
+old=$PWD
+cd $(dirname $(readlink -f "$0"))
+cd ../
+FLUXPLUGHOME=$PWD
+. "$FLUXPLUGHOME"/master
+cd $old
 
 LINE=$("$AWK" -v myhost="$myhost" -v time=`date -u +%s%N` '{load1=$1; load5=$2; load15=$3 } END {printf "loadavg,host=%s load_1=%s,load_5=%s,load_15=%s %s\n",myhost,load1,load5,load15,time}' /proc/loadavg )
 
diff --git a/meminfo.sh b/plugins-available/meminfo.sh
similarity index 80%
rename from meminfo.sh
rename to plugins-available/meminfo.sh
index 92d7f51..bd931eb 100755
--- a/meminfo.sh
+++ b/plugins-available/meminfo.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
 
 set -o noclobber
-
-HOME=$(dirname $0)
-. "$HOME"/master
+old=$PWD
+cd $(dirname $(readlink -f "$0"))
+cd ../
+FLUXPLUGHOME=$PWD
+. "$FLUXPLUGHOME"/master
+cd $old
 
 LINE=$("$AWK" -v myhost="$myhost" -v time=`date -u +%s%N` '{if ($1 ~/MemTotal:/) memtotal=$2; if ($1 ~/MemFree:/) memfree=$2; if ($1 ~/MemAvailable:/) memavailable=$2} END {if ( memtotal && memfree && memavailable ) printf "meminfo,host=%s mem_total=%si,mem_free=%si,mem_available=%si %s\n",myhost,memtotal,memfree,memavailable,time}' /proc/meminfo)
 
diff --git a/packs.sh b/plugins-available/packs.sh
similarity index 76%
rename from packs.sh
rename to plugins-available/packs.sh
index 200bb69..02ffccd 100755
--- a/packs.sh
+++ b/plugins-available/packs.sh
@@ -1,9 +1,12 @@
 #!/bin/sh
 
 set -o noclobber
-
-HOME=$(dirname $0)
-. "$HOME"/master
+old=$PWD
+cd $(dirname $(readlink -f "$0"))
+cd ../
+FLUXPLUGHOME=$PWD
+. "$FLUXPLUGHOME"/master
+cd $old
 
 LINE=$("$APT" | "$AWK" -v myhost="$myhost" -v time=`date -u +%s%N`  '{if ($1~/^Inst/) counter=counter+1} END {if (counter) printf "packages,host=%s packs=%si %s\n",myhost,counter,time}')
 
diff --git a/plugins-enabled/.keep b/plugins-enabled/.keep
new file mode 100644
index 0000000..e69de29