Merge branch 'master' of gitosis@majnematic.com:davesdots

This commit is contained in:
David Majnemer 2009-12-07 12:44:11 -06:00
commit 4bb177d29a
3 changed files with 8 additions and 7 deletions

View file

@ -3,10 +3,7 @@ export HISTFILE="${HOME}/.bash/.history"
export HISTSIZE=1000 export HISTSIZE=1000
# don't put duplicate lines in the history. See bash(1) for more options # ignore both duplicates and whitespace in history
# don't overwrite GNU Midnight Commander's setting of `ignorespace'.
export HISTCONTROL=$HISTCONTROL${HISTCONTROL+,}ignoredups
# ... or force ignoredups and ignorespace
export HISTCONTROL=ignoreboth export HISTCONTROL=ignoreboth
# append to the history file, don't overwrite it # append to the history file, don't overwrite it

View file

@ -4,6 +4,10 @@
use strict; use strict;
use warnings; use warnings;
use LWP::Debug ();
# LWP::Authen::Negotiate is the Perl module that makes kerberos authenitcation
# magically work
my $URL = 'https://www-s.acm.uiuc.edu/caffeine'; my $URL = 'https://www-s.acm.uiuc.edu/caffeine';

View file

@ -96,10 +96,10 @@ for my $file (keys %links) {
} }
# Remove the destination if it exists and we were told to force an overwrite # Remove the destination if it exists and we were told to force an overwrite
if($force && -f $dest) { if($force && -d $dest) {
unlink($dest) || warn "Couldn't unlink '$dest': $!\n";
} elsif($force && -d $dest) {
rmtree($dest) || warn "Couldn't rmtree '$dest': $!\n"; rmtree($dest) || warn "Couldn't rmtree '$dest': $!\n";
} elsif($force) {
unlink($dest) || warn "Couldn't unlink '$dest': $!\n";
} }
symlink($src => $dest) ? $i++ : warn "Couldn't link '$src' to '$dest': $!\n"; symlink($src => $dest) ? $i++ : warn "Couldn't link '$src' to '$dest': $!\n";