desktop/CurseTheWeather: Updated for version 0.4

4 files changed, 38 insertions, 33 deletions

diff --git a/desktop/CurseTheWeather/CurseTheWeather.SlackBuild b/desktop/CurseTheWeather/CurseTheWeather.SlackBuild
index 2820875b7602..3da1ad340b0e 100644
--- a/desktop/CurseTheWeather/CurseTheWeather.SlackBuild
+++ b/desktop/CurseTheWeather/CurseTheWeather.SlackBuild
@@ -22,11 +22,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuils.org project.
+# Modified by the SlackBuilds.org project.
 
 PRGNAM=CurseTheWeather
-VERSION=0.3
-ARCH=${ARCH:-i486}
+VERSION=0.4
+ARCH=i486		# This does nothing for the software
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 CWD=$(pwd)
@@ -34,12 +34,14 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
@@ -47,8 +49,8 @@ python setup.py install --prefix $PKG/usr
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a PKG-INFO README.txt $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 zcat GPL.gz > $PKG/usr/doc/$PRGNAM-$VERSION/GPL
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/desktop/CurseTheWeather/CurseTheWeather.info b/desktop/CurseTheWeather/CurseTheWeather.info
index 9668c6b7abec..6d0e637f8abf 100644
--- a/desktop/CurseTheWeather/CurseTheWeather.info
+++ b/desktop/CurseTheWeather/CurseTheWeather.info
@@ -1,8 +1,8 @@
 PRGNAM="CurseTheWeather"
-VERSION="0.3"
+VERSION="0.4"
 HOMEPAGE="http://opensource.hld.ca/trac.cgi/wiki/CurseTheWeather"
-DOWNLOAD="http://opensource.hld.ca/trac.cgi/browser/trunk/ctw/dist/CurseTheWeather-0.3.tar.gz?format=raw"
-MD5SUM="a391be3eca4d312951f3ecc923d1911f"
-MAINTAINER="Martin Lefebvre"
-EMAIL="dadexter@sekurity.com"
-APPROVED="BP{k}"
+DOWNLOAD="http://opensource.hld.ca/trac.cgi/export/313/trunk/ctw/dist/CurseTheWeather-0.4.tar.gz"
+MD5SUM="05882e98fa6b564d514ee71bc7d9f09f"
+MAINTAINER="Phillip Warner"
+EMAIL="pc_warner@yahoo.com"
+APPROVED="Michiel"
diff --git a/desktop/CurseTheWeather/README b/desktop/CurseTheWeather/README
index 64f4305c012e..c3b41705e6a3 100644
--- a/desktop/CurseTheWeather/README
+++ b/desktop/CurseTheWeather/README
@@ -1,16 +1,19 @@
-CurseTheWeather v0.3
+CurseTheWeather is a python application which displays the weather in a 
+terminal via a ncurses frontend (ctw).  This frontend shows ascii-art weather 
+icons along with the current weather conditions and 10 day forecast.
 
-CurseTheWeather is a curses application which displays the
-weather in a terminal. It can give the current weather as
-well as forcast for up to 10 days.
+weatherfeed.py is the python module that grabs the weather data from 
+weather.com, and it can used by frontends other than ctw.
 
-weatherfeed.py is a module that it uses and it can be used
-by other frontends to get weather information. Each time it
-is instantiated, it grabs the weather from weather.com
 
-Due to the fact that the CurseTheWeather website uses trac the 
-download is somewhat misformed when using wget. If you use FF or another 
-browser this problem should not occur.
+** ctw and Transparency, Different Colors **
 
-The following commandshould solve this:
-mv CurseTheWeather-0.3.tar.gz\?format\=raw CurseTheWeather-0.3.tar.gz
+If you are interested in changing the colors in ctw, or if you use 
+transparency in your terminals and would like this to work with ctw, then 
+simply modify initColors() in /usr/bin/ctw.  For transparency, simply add:
+
+curses.use_default_colors()
+
+at line 125 (just under "curses.start_color()").
+Modifying the lines with "curses.init_pair" will allow you to modify the text 
+colors used.
diff --git a/desktop/CurseTheWeather/slack-desc b/desktop/CurseTheWeather/slack-desc
index 71aba06ee73c..dd4bf1c730bd 100644
--- a/desktop/CurseTheWeather/slack-desc
+++ b/desktop/CurseTheWeather/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':'.
 
                |-----handy-ruler------------------------------------------------------|
-CurseTheWeather: CurseTheWeather (curses application which displays the weather)
+CurseTheWeather: CurseTheWeather (ncurses Weather Application)
 CurseTheWeather: 
-CurseTheWeather: CurseTheWeather is a curses application which displays the
-CurseTheWeather: weather in a terminal. It can give the current weather as
-CurseTheWeather: well as forcast for up to 10 days.
-CurseTheWeather: 
-CurseTheWeather: weatherfeei.py is a module that it uses and it can be used
-CurseTheWeather: by other frontends to get weather information. Each time it
-CurseTheWeather: is instantiated, it grabs the weather from weather.com
+CurseTheWeather: CurseTheWeather is a python application which displays the weather 
+CurseTheWeather: in a terminal via a ncurses frontend (ctw).  This frontend shows 
+CurseTheWeather: ascii-art weather icons along with the current weather conditions 
+CurseTheWeather: and 10 day forecast.
 CurseTheWeather: 
+CurseTheWeather: weatherfeed.py is the python module that grabs the weather data from 
+CurseTheWeather: weather.com, and it can used by frontends other than ctw.
 CurseTheWeather: 
+CurseTheWeather: http://opensource.hld.ca/trac.cgi/wiki/CurseTheWeather