diff options
author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2012-11-07 17:57:37 (GMT) |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2012-11-07 17:57:37 (GMT) |
commit | 217a6a7643867ad949c25b5e8ca2d1839ec28133 (patch) | |
tree | 54a2cd2832a585866e1d684434bbc8ea65f12080 | |
parent | d168c0023c24f0ecac44a2ed2283f2760359af31 (diff) | |
download | monitoring-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-- | .gitignore | 2 | ||||
-rw-r--r-- | doc/makefile | 2 | ||||
-rwxr-xr-x | tools/sfwebcron | 13 |
3 files changed, 9 insertions, 8 deletions
@@ -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 | ||
10 | clean: | 10 | clean: |
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 |
13 | PROJECT=nagiosplug | 13 | PROJECT=nagiosplug |
14 | IN=${HOME}/sfwebcron | 14 | IN=${HOME}/sfwebcron |
15 | PROBE="developer-guidelines.html.last" | ||
15 | OUT_SERVER="tonvoon@frs.sourceforge.net" | 16 | OUT_SERVER="tonvoon@frs.sourceforge.net" |
16 | OUT_PATH="/home/groups/n/na/nagiosplug/htdocs" | 17 | OUT_PATH="/home/groups/n/na/nagiosplug/htdocs" |
17 | 18 | ||
18 | if [[ ! -e developer-guidelines.html.last ]] ; then | ||
19 | touch developer-guidelines.html.last | ||
20 | fi | ||
21 | |||
22 | # Get latest dev guildelines | 19 | # Get latest dev guildelines |
23 | [[ ! -d $IN ]] && mkdir $IN | 20 | [[ ! -d $IN ]] && mkdir $IN |
24 | cd $IN | 21 | cd $IN |
25 | if [[ ! -d nagios-plugins ]] ; then | 22 | if [[ ! -d nagios-plugins ]] |
23 | then | ||
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 |
27 | fi | 25 | fi |
28 | cd nagios-plugins/doc | 26 | cd nagios-plugins/doc |
29 | git pull | 27 | git pull |
30 | 28 | ||
31 | make | 29 | make |
32 | if [[ developer-guidelines.html -nt developer-guidelines.html.last ]] ; then | 30 | if [[ ! -e $PROBE || developer-guidelines.html -nt $PROBE ]] |
31 | then | ||
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 |
35 | fi | 34 | fi |
36 | 35 | ||