summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Guyot-Sionnest <dermoth@aei.ca>2012-11-07 17:57:37 (GMT)
committerThomas Guyot-Sionnest <dermoth@aei.ca>2012-11-07 17:57:37 (GMT)
commit217a6a7643867ad949c25b5e8ca2d1839ec28133 (patch)
tree54a2cd2832a585866e1d684434bbc8ea65f12080
parentd168c0023c24f0ecac44a2ed2283f2760359af31 (diff)
downloadmonitoring-plugins-217a6a7643867ad949c25b5e8ca2d1839ec28133.tar.gz
Fix sfwebcron probe file
The initial file was created in the user's home and later tested in the doc directory. Instead, just rsync if the file is missing. Also add some temporary files to gitignore/make clean
-rw-r--r--.gitignore2
-rw-r--r--doc/makefile2
-rwxr-xr-xtools/sfwebcron13
3 files changed, 9 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore
index 52ca6aa..bda7b27 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,6 +37,8 @@ NP-VERSION-FILE
37 37
38# /doc/ 38# /doc/
39/doc/developer-guidelines.html 39/doc/developer-guidelines.html
40/doc/developer-guidelines.html.last
41/doc/jade-out.fot
40 42
41# /tap/ 43# /tap/
42/tap/.deps 44/tap/.deps
diff --git a/doc/makefile b/doc/makefile
index b1b56c1..89caf9e 100644
--- a/doc/makefile
+++ b/doc/makefile
@@ -8,4 +8,4 @@ developer-guidelines.html: developer-guidelines.sgml
8 fi 8 fi
9 9
10clean: 10clean:
11 rm -f developer-guidelines.html 11 rm -f developer-guidelines.html developer-guidelines.html.last jade-out.fot
diff --git a/tools/sfwebcron b/tools/sfwebcron
index c270cef..0f31fcf 100755
--- a/tools/sfwebcron
+++ b/tools/sfwebcron
@@ -12,25 +12,24 @@ trap 'echo "Command failed at line $LINENO"' ERR
12# Set working variables 12# Set working variables
13PROJECT=nagiosplug 13PROJECT=nagiosplug
14IN=${HOME}/sfwebcron 14IN=${HOME}/sfwebcron
15PROBE="developer-guidelines.html.last"
15OUT_SERVER="tonvoon@frs.sourceforge.net" 16OUT_SERVER="tonvoon@frs.sourceforge.net"
16OUT_PATH="/home/groups/n/na/nagiosplug/htdocs" 17OUT_PATH="/home/groups/n/na/nagiosplug/htdocs"
17 18
18if [[ ! -e developer-guidelines.html.last ]] ; then
19 touch developer-guidelines.html.last
20fi
21
22# Get latest dev guildelines 19# Get latest dev guildelines
23[[ ! -d $IN ]] && mkdir $IN 20[[ ! -d $IN ]] && mkdir $IN
24cd $IN 21cd $IN
25if [[ ! -d nagios-plugins ]] ; then 22if [[ ! -d nagios-plugins ]]
23then
26 git clone https://github.com/nagios-plugins/nagios-plugins.git nagios-plugins 24 git clone https://github.com/nagios-plugins/nagios-plugins.git nagios-plugins
27fi 25fi
28cd nagios-plugins/doc 26cd nagios-plugins/doc
29git pull 27git pull
30 28
31make 29make
32if [[ developer-guidelines.html -nt developer-guidelines.html.last ]] ; then 30if [[ ! -e $PROBE || developer-guidelines.html -nt $PROBE ]]
31then
33 rsync -av developer-guidelines.{html,sgml} $OUT_SERVER:$OUT_PATH/ 32 rsync -av developer-guidelines.{html,sgml} $OUT_SERVER:$OUT_PATH/
34 touch developer-guidelines.html.last 33 touch $PROBE
35fi 34fi
36 35