From 8ecc889b188113e3a94a3280d2c549270d19d43a Mon Sep 17 00:00:00 2001 From: slakmagik Date: Wed, 2 Jun 2010 23:26:03 +0000 Subject: [PATCH] Copyrights, timeouts, typo A shotgun commit that updates the copyright notices, bumps the default timeouts of rsync and wget from 10/15 to 30 and fixes a doubled word. --- src/etc/sbopkg/sbopkg.conf.new | 4 ++-- src/usr/doc/README | 2 ++ src/usr/man/man5/sbopkg.conf.5 | 4 ++-- src/usr/man/man8/sbopkg.8 | 2 +- src/usr/sbin/sbopkg | 2 ++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/etc/sbopkg/sbopkg.conf.new b/src/etc/sbopkg/sbopkg.conf.new index fc9fa5c..6660bbf 100644 --- a/src/etc/sbopkg/sbopkg.conf.new +++ b/src/etc/sbopkg/sbopkg.conf.new @@ -36,7 +36,7 @@ export OUTPUT=${OUTPUT:-/tmp} # so there is no need to add those flags here. Similarly, wget already # uses the -O options so there is no need to add that either. In general, # it is not recommended that users change these default values. -RSYNCFLAGS="--verbose --timeout=10" -WGETFLAGS="--continue --progress=bar:force --timeout=15 --tries=5" +RSYNCFLAGS="--verbose --timeout=30" +WGETFLAGS="--continue --progress=bar:force --timeout=30 --tries=5" DIFF=${DIFF:-diff} DIFFOPTS=${DIFFOPTS:--u} diff --git a/src/usr/doc/README b/src/usr/doc/README index f3730e8..63917cf 100644 --- a/src/usr/doc/README +++ b/src/usr/doc/README @@ -3,6 +3,8 @@ Sbopkg README Copyright 2007-2010 Chess Griffin +Copyright 2009-2010 Mauro Giachero + slakmagik Homepage: http://www.sbopkg.org diff --git a/src/usr/man/man5/sbopkg.conf.5 b/src/usr/man/man5/sbopkg.conf.5 index 651a4ec..eb76dd5 100644 --- a/src/usr/man/man5/sbopkg.conf.5 +++ b/src/usr/man/man5/sbopkg.conf.5 @@ -331,7 +331,7 @@ is a useful option to play with if getting syncing errors. .IP The default assignment is: .IP -\fCRSYNCFLAGS="--verbose --timeout=10"\fP +\fCRSYNCFLAGS="--verbose --timeout=30"\fP .\"--------------------------------------------------------------------- .TP .B SBOPKGTMP @@ -410,7 +410,7 @@ is a useful option to play with if getting download errors. .IP The default assignment is: .IP -\fCWGETFLAGS="--continue --progress=bar:force --timeout=15 --tries=5"\fP +\fCWGETFLAGS="--continue --progress=bar:force --timeout=30 --tries=5"\fP .\"===================================================================== .SH NOTES .\"--------------------------------------------------------------------- diff --git a/src/usr/man/man8/sbopkg.8 b/src/usr/man/man8/sbopkg.8 index d6b9e19..804516e 100644 --- a/src/usr/man/man8/sbopkg.8 +++ b/src/usr/man/man8/sbopkg.8 @@ -289,7 +289,7 @@ before the final application is built and installed. Of course, given the nature of dependencies, this may not always be possible and so building dependencies like this is not really a supported feature. -Still, when when it works, it can be helpful. +Still, when it works, it can be helpful. .\"--------------------------------------------------------------------- .TP .B \-k diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg index 3320ba6..9001ed7 100755 --- a/src/usr/sbin/sbopkg +++ b/src/usr/sbin/sbopkg @@ -4,6 +4,8 @@ # # sbopkg - The SlackBuilds.org Package Browser # Copyright 2007-2010 Chess Griffin +# Copyright 2009-2010 Mauro Giachero +# slakmagik # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: