Update of /cvsroot/fink/experimental/gecko2/scripts
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4993
Modified Files:
generate-distfiles-and-finkinfo-mirror.pl
sync-distfiles-finkinfo.sh
Log Message:
Some logoutput adjustment
Index: sync-distfiles-finkinfo.sh
===================================================================
RCS file: /cvsroot/fink/experimental/gecko2/scripts/sync-distfiles-finkinfo.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sync-distfiles-finkinfo.sh 24 Aug 2009 10:03:47 -0000 1.1
+++ sync-distfiles-finkinfo.sh 26 Aug 2009 10:21:44 -0000 1.2
@@ -3,44 +3,46 @@
test -f ~fink/infodist/FORCED && mv ~fink/infodist/FORCED{,.old}
test -f ~fink/log/change.log && date -u +%s >~fink/infodist/FORCED && rm -f
~fink/infodist/FORCED.old
~fink/scripts/generate-distfiles-and-finkinfo-mirror.pl
-printf "\n\n\nLogFile: ~fink/log/mirror.log\n\n"
-fgrep -v 'has not changed' ~fink/log/mirror.log | sed 's/^/| /'
-if [ \! -f ~fink/log/change.log ]; then
- printf '~fink/log/change.log is missing...'
- exit 0
-fi
-if [ "$(grep -e '.info$' -e '.patch$' ~fink/log/change.log)" != "" ]; then
- printf '\nApplying changes in cvs to infodist files:\n'
- cd ~fink/finkinfo/dists.public/10.4
- for tree in stable unstable; do
- if [ "$(grep 10.4/"${tree}"/ ~fink/log/change.log)" != "" ];
then
- printf " Regenerating 10.4-${tree} tarball\n"
- if tar cjph --group 80 --numeric-owner -f
~fink/infodist/10.4-${tree}.tbz.new stable; then
- mv ~fink/infodist/10.4-${tree}.tbz.new
~fink/infodist/10.4-${tree}.tbz
- else
- printf " Regenerating of 10.4-${tree} tarball
FAILED!\n"
- exit 0
- fi
- printf " Calculating new checksums for 10.4-"${tree}"\n"
- for check in md5 sha1 sha256; do
- ${check}sum ~fink/infodist/10.4-${tree}.tbz |
cut -f 1 -d " " >~fink/infodist/10.4-${tree}.tbz.${check}
- done
- printf " Creating symlinks and timestamps for
10.5-"${tree}" and 10.6-"${tree}"\n"
- date -u +%s >~fink/infodist/10.4-${tree}-LOCAL
- for dist in 10.5 10.6; do
- ln -sf 10.4-${tree}.tbz
~fink/infodist/${dist}-${tree}.tbz
+if [ \! -f ~fink/mirwork/mirror.lock ]; then
+ printf "\n\n\nLogFile: ~fink/log/mirror.log\n\n"
+ grep -ve 'has not changed' -e 'fetching files for' -e 'exists$'
~fink/log/mirror.log | sed 's/^/| /'
+ if [ \! -f ~fink/log/change.log ]; then
+ printf '~fink/log/change.log is missing...'
+ exit 0
+ fi
+ if [ "$(grep -e '.info$' -e '.patch$' ~fink/log/change.log)" != "" ];
then
+ printf '\nApplying changes in cvs to infodist files:\n'
+ cd ~fink/finkinfo/dists.public/10.4
+ for tree in stable unstable; do
+ if [ "$(grep 10.4/"${tree}"/ ~fink/log/change.log)" !=
"" ]; then
+ printf " Regenerating 10.4-${tree} tarball\n"
+ if tar cjph --group 80 --numeric-owner -f
~fink/infodist/10.4-${tree}.tbz.new stable; then
+ mv ~fink/infodist/10.4-${tree}.tbz.new
~fink/infodist/10.4-${tree}.tbz
+ else
+ printf " Regenerating of 10.4-${tree}
tarball FAILED!\n"
+ exit 0
+ fi
+ printf " Calculating new checksums for
10.4-"${tree}"\n"
for check in md5 sha1 sha256; do
- ln -sf 10.4-${tree}.tbz.${check}
~fink/infodist/${dist}-${tree}.tbz.${check}
+ ${check}sum
~fink/infodist/10.4-${tree}.tbz | cut -f 1 -d " "
>~fink/infodist/10.4-${tree}.tbz.${check}
done
- ln -sf 10.4-${tree}-LOCAL
~fink/infodist/${dist}-${tree}-LOCAL
- done
- fi
- done
-else
- printf '\nNo changes to infodist needed\n'
+ printf " Creating symlinks and timestamps for
10.5-"${tree}" and 10.6-"${tree}"\n"
+ date -u +%s >~fink/infodist/10.4-${tree}-LOCAL
+ for dist in 10.5 10.6; do
+ ln -sf 10.4-${tree}.tbz
~fink/infodist/${dist}-${tree}.tbz
+ for check in md5 sha1 sha256; do
+ ln -sf
10.4-${tree}.tbz.${check} ~fink/infodist/${dist}-${tree}.tbz.${check}
+ done
+ ln -sf 10.4-${tree}-LOCAL
~fink/infodist/${dist}-${tree}-LOCAL
+ done
+ fi
+ done
+ else
+ printf '\nNo changes to infodist needed\n'
+ fi
+ printf ' Getting TIMESTAMP\n'
+ cp -p ~fink/finkinfo/dists.public/TIMESTAMP ~fink/infodist/TIMESTAMP
+ printf ' Cleaning up\n'
+ rm -f ~fink/log/change.log
+ printf 'done\n'
fi
-printf ' Getting TIMESTAMP\n'
-cp -p ~fink/finkinfo/dists.public/TIMESTAMP ~fink/infodist/TIMESTAMP
-printf ' Cleaning up\n'
-rm -f ~fink/log/change.log
-printf 'done\n'
Index: generate-distfiles-and-finkinfo-mirror.pl
===================================================================
RCS file:
/cvsroot/fink/experimental/gecko2/scripts/generate-distfiles-and-finkinfo-mirror.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- generate-distfiles-and-finkinfo-mirror.pl 24 Aug 2009 10:03:47 -0000
1.1
+++ generate-distfiles-and-finkinfo-mirror.pl 26 Aug 2009 10:21:44 -0000
1.2
@@ -39,7 +39,7 @@
my $msg = "Another process is already running.\n";
if (-f $LOGFILE && -r _) {
$msg .= "Existing logfile:\n";
- $msg .= `grep -v 'has not changed' $LOGFILE`;
+ $msg .= `grep -ve 'has not changed' -e 'fetching files for' -e
'exists$' $LOGFILE`;
}
die $msg;
}
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
