From 20a549af7196b7abaabef0aca56da58aeac59943 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 17 Mar 2008 09:17:53 +0100 Subject: [PATCH] add more gpl3 headers / correct them --- release.sh | 19 ++++++++++++++++++- tools/README | 19 +++++++++++++++++++ tools/ccollect_analyse_logs.sh | 3 ++- tools/ccollect_delete_source.sh | 1 + tools/ccollect_logwrapper.sh | 1 + tools/ccollect_stats.sh | 22 +++++++++++----------- tools/config-pre-0.4-to-0.4.sh | 22 ++++++++++++++++++++-- tools/config-pre-0.4-to-0.4.sub.sh | 21 +++++++++++++++++++-- tools/config-pre-0.6-to-0.6.sh | 21 +++++++++++++++++++-- tools/config-pre-0.6-to-0.6.sub.sh | 21 +++++++++++++++++++-- tools/config-pre-0.7-to-0.7.sh | 3 ++- tools/config-pre-0.7-to-0.7.sub.sh | 2 ++ tools/gnu-du-backup-size-compare.sh | 21 ++++++++++++++++++--- 13 files changed, 151 insertions(+), 25 deletions(-) create mode 100644 tools/README diff --git a/release.sh b/release.sh index 7a758bb..e6ae08a 100755 --- a/release.sh +++ b/release.sh @@ -1,5 +1,22 @@ #!/bin/sh -# Nico Schottelius +# +# 200?-2008 Nico Schottelius (nico-ccollect at schottelius.org) +# +# This file is part of ccollect. +# +# ccollect is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ccollect is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ccollect. If not, see . +# # Standard release script for dummies like me # diff --git a/tools/README b/tools/README new file mode 100644 index 0000000..7312018 --- /dev/null +++ b/tools/README @@ -0,0 +1,19 @@ +Files and their tasks / destinations: + +ccollect_add_source.sh: bin +ccollect_analyse_logs.sh: bin +ccollect_create_source2.sh: ??? +ccollect_create_source.sh: ??? +ccollect_delete_source.sh: bin +ccollect_list_intervals.sh: bin +ccollect_logwrapper.sh: bin +ccollect-stats.sh: ??? +config-pre-0.4-to-0.4.BUGS: only to be used for converting +config-pre-0.4-to-0.4.sh: only to be used for converting +config-pre-0.4-to-0.4.sub.sh: only to be used for converting +config-pre-0.6-to-0.6.sh: only to be used for converting +config-pre-0.6-to-0.6.sub.sh: only to be used for converting +config-pre-0.7-to-0.7.sh: only to be used for converting +config-pre-0.7-to-0.7.sub.sh: only to be used for converting +gnu-du-backup-size-compare.sh +README diff --git a/tools/ccollect_analyse_logs.sh b/tools/ccollect_analyse_logs.sh index b8128d0..e1484a2 100755 --- a/tools/ccollect_analyse_logs.sh +++ b/tools/ccollect_analyse_logs.sh @@ -19,7 +19,8 @@ # # Written for Netstream (www.netstream.ch) on Di 21. Aug 17:10:15 CEST 2007 # -# Analyse existing logs +# Analyse logs +# version=0.1 date=2007-08-24 diff --git a/tools/ccollect_delete_source.sh b/tools/ccollect_delete_source.sh index d7dd2e1..636ce67 100755 --- a/tools/ccollect_delete_source.sh +++ b/tools/ccollect_delete_source.sh @@ -19,6 +19,7 @@ # # 2007-08-16 Written for Netstream (www.netstream.ch) # Delete sources and their backups (optionally). +# # standard values CCOLLECT_CONF="${CCOLLECT_CONF:-/etc/ccollect}" diff --git a/tools/ccollect_logwrapper.sh b/tools/ccollect_logwrapper.sh index 9afa557..ac7f496 100755 --- a/tools/ccollect_logwrapper.sh +++ b/tools/ccollect_logwrapper.sh @@ -20,6 +20,7 @@ # Written for Netstream (www.netstream.ch) on Fr 8. Jun 10:30:24 CEST 2007 # # Call the log-wrapper instead of ccollect.sh and it will create nice logs +# # # where to find our configuration and temporary file diff --git a/tools/ccollect_stats.sh b/tools/ccollect_stats.sh index 273ca65..f1f62ad 100644 --- a/tools/ccollect_stats.sh +++ b/tools/ccollect_stats.sh @@ -11,15 +11,15 @@ if [ ! -e /tmp/ccollect-stats.lock ] then - touch /tmp/ccollect-stats.lock - find /etc/ccollect/sources/ -type l | while read line - do - backupname=$(basename $(readlink $line)) - echo "====[Backup: $backupname]====" | tee -a /var/log/backup.log - du -sh $line/* | tee -a /var/log/backup.log - done - rm /tmp/ccollect-stats.lock + touch /tmp/ccollect-stats.lock + + # changes after license clearify + # for dest in /etc/ccollect/sources/ -type f -name destination | while read line + + find /etc/ccollect/sources/ -type l | while read line + d=$(basename $(readlink $line)) + echo "====[Backup: $backupname]====" | tee -a /var/log/backup.log + du -sh $line/* | tee -a /var/log/backup.log + done + rm /tmp/ccollect-stats.lock fi - - - diff --git a/tools/config-pre-0.4-to-0.4.sh b/tools/config-pre-0.4-to-0.4.sh index 9a7efd8..23b3307 100755 --- a/tools/config-pre-0.4-to-0.4.sh +++ b/tools/config-pre-0.4-to-0.4.sh @@ -1,6 +1,24 @@ #!/bin/sh -# Nico Schottelius -# Do Apr 27 09:13:26 CEST 2006 +# +# 2006-2008 Nico Schottelius (nico-ccollect at schottelius.org) +# +# +# This file is part of ccollect. +# +# ccollect is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ccollect is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ccollect. If not, see . +# +# Written on Do Apr 27 09:13:26 CEST 2006 # if [ $# -ne 1 ]; then diff --git a/tools/config-pre-0.4-to-0.4.sub.sh b/tools/config-pre-0.4-to-0.4.sub.sh index 5b17a72..e28e718 100755 --- a/tools/config-pre-0.4-to-0.4.sub.sh +++ b/tools/config-pre-0.4-to-0.4.sub.sh @@ -1,6 +1,23 @@ #!/bin/sh -# Nico Schottelius -# Do Apr 27 09:13:26 CEST 2006 +# +# 2006-2008 Nico Schottelius (nico-ccollect at schottelius.org) +# +# This file is part of ccollect. +# +# ccollect is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ccollect is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ccollect. If not, see . +# +# Written on Do Apr 27 09:13:26 CEST 2006 # master=$(echo $0 | sed 's/\.sub//') diff --git a/tools/config-pre-0.6-to-0.6.sh b/tools/config-pre-0.6-to-0.6.sh index 5efce68..58a538a 100755 --- a/tools/config-pre-0.6-to-0.6.sh +++ b/tools/config-pre-0.6-to-0.6.sh @@ -1,7 +1,24 @@ #!/bin/sh -# Nico Schottelius, 20070816-2225 +# +# 2007-2008 Nico Schottelius (nico-ccollect at schottelius.org) +# +# This file is part of ccollect. +# +# ccollect is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ccollect is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ccollect. If not, see . +# +# Written on 20070816-2225 # Transfer configuration to 0.6 layout -# Copying: GPLv3 # if [ $# -ne 1 ]; then diff --git a/tools/config-pre-0.6-to-0.6.sub.sh b/tools/config-pre-0.6-to-0.6.sub.sh index b4e0bd3..7744f9e 100755 --- a/tools/config-pre-0.6-to-0.6.sub.sh +++ b/tools/config-pre-0.6-to-0.6.sub.sh @@ -1,7 +1,24 @@ #!/bin/sh -# Nico Schottelius, 20070816-2227 +# +# 2007-2008 Nico Schottelius (nico-ccollect at schottelius.org) +# +# This file is part of ccollect. +# +# ccollect is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ccollect is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ccollect. If not, see . +# +# Written on 20070816-2227 # Transfer configuration to 0.6 layout (subscript) -# Copying: GPLv3 # if [ $# -ne 1 ]; then diff --git a/tools/config-pre-0.7-to-0.7.sh b/tools/config-pre-0.7-to-0.7.sh index f83341f..6d540ab 100755 --- a/tools/config-pre-0.7-to-0.7.sh +++ b/tools/config-pre-0.7-to-0.7.sh @@ -17,7 +17,8 @@ # You should have received a copy of the GNU General Public License # along with ccollect. If not, see . # -# Convert configuration to 0.6 layout +# Convert configuration to 0.7 layout +# if [ $# -ne 1 ]; then echo "$0: ccollect-configuration directory" diff --git a/tools/config-pre-0.7-to-0.7.sub.sh b/tools/config-pre-0.7-to-0.7.sub.sh index 4579924..bb43285 100755 --- a/tools/config-pre-0.7-to-0.7.sub.sh +++ b/tools/config-pre-0.7-to-0.7.sub.sh @@ -17,6 +17,8 @@ # You should have received a copy of the GNU General Public License # along with ccollect. If not, see . # +# Helper script +# if [ $# -ne 1 ]; then echo "$0: destination-file" diff --git a/tools/gnu-du-backup-size-compare.sh b/tools/gnu-du-backup-size-compare.sh index 85b876b..cf3b194 100755 --- a/tools/gnu-du-backup-size-compare.sh +++ b/tools/gnu-du-backup-size-compare.sh @@ -1,8 +1,23 @@ #!/bin/sh +# +# 2007-2008 Nico Schottelius (nico-ccollect at schottelius.org) +# +# This file is part of ccollect. # -# Nico Schottelius -# Date: 2007-08-16 -# Last Modified: - +# ccollect is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# ccollect is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with ccollect. If not, see . +# +# Written on 2007-08-16 # exit 1