Merge branch 'master' of github.com:leto/Util

bin/setup_env

@@ -1,20 +1,13 @@
-#!/bin/sh
-# Setup a Duke Leto approved work environment
-
-GITGZ=http://kernel.org/pub/software/scm/git/git-1.7.4.1.tar.gz
+#!/bin/bash
+# Setup a Duke Leto approved env, assuming git is installed
 
 cd $HOME
 mkdir git
 cd git
 
-wget 2>&1 && { echo "no wget, bailing"; exit 1; }
-
-wget $GITGZ; tar zxvpf $GITGZ; cd git-1.7.4.1; gmake prefix=$HOME NO_CURL=1 install;
-
 echo "Cloning Util.git"
-git clone git://github.com/leto/Util.git
+git clone git://github.com/leto/Util.git util
 
-mv Util util
 cd $HOME
 echo "Symlinking config files and ~/bin"
 $HOME/git/util/bin/shadow_config
@@ -23,7 +16,3 @@ $HOME/git/util/bin/cpanm local::lib
 
 perl -Mlocal::lib >> ~/.bashrc.local
 source .bashrc
-cpanm LWP::UserAgent
-cpanm TAP::Harness::Archive
-cd git
-git clone git://github.com/parrot/parrot.git

bin/shadow_config

@@ -6,7 +6,6 @@ use File::Spec::Functions;
 my @config_files = qw/
     .ackrc
     .bashrc
-    .bashrc.aliases
     .dir_colors
     .gitconfig
     .irssi

bin/weather

@@ -19,11 +19,10 @@ my $current_text = $current->{text};
 my ($sunrise, $sunset) = ($weather->{Astronomy}{sunrise},$weather->{Astronomy}{sunset});
 my ($day1,$day2) = @{ $weather->{TwoDayForecast} };
 
-printf "Weather for $city, $region\n";
-printf "${current_temp}F, $current_text at $current_date\n";
-printf "Sunrise: $sunrise\n";
-printf "Sunset : $sunset\n";
+printf "${current_temp}F, $current_text\n";
+#printf "$city, $region\n"; # $current_date\n";
+printf "Light:($sunrise,$sunset)\n";
 
-printf "%s : %s-%sF %s\n%s : %s-%sF %s\n",
-    $day1->{day}, $day1->{low}, $day1->{high}, $day1->{text},
-    $day2->{day}, $day2->{low}, $day2->{high}, $day2->{text};
+printf "%s %s: %s-%sF %s\n%s %s: %s-%sF %s\n",
+    $day1->{day}, (split(' ',$day1->{date}))[0], $day1->{low}, $day1->{high}, $day1->{text},
+    $day2->{day}, (split(' ',$day2->{date}))[0], $day2->{low}, $day2->{high}, $day2->{text};