From: Simon Ruderich <simon@ruderich.org>
Date: Sun, 24 Mar 2013 14:36:09 +0000 (+0100)
Subject: Merge lftp configuration repository.
X-Git-Url: https://ruderich.org/simon/gitweb/?p=config%2Fdotfiles.git;a=commitdiff_plain;h=733df0002c03b0c503cb09b970c78a6dd54a4793

Merge lftp configuration repository.

Conflicts:
	.gitignore
	setup.sh
---

733df0002c03b0c503cb09b970c78a6dd54a4793
diff --cc .gitignore
index e3dd230,b96f5b6..42531eb
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,4 +1,4 @@@
 -# Ignore lftp log and history files.
+ /lftp/cwd_history
+ /lftp/rl_history
+ /lftp/transfer_log
 +/maxima/maxout.gnuplot_pipes
diff --cc setup.sh
index 38cac8e,ac253c3..f64aa37
--- a/setup.sh
+++ b/setup.sh
@@@ -1,8 -1,8 +1,8 @@@
  #!/bin/sh
  
 -# Setup script for lftp configuration files.
 +# Setup script for miscellaneous configuration files.
  
- # Copyright (C) 2011-2012  Simon Ruderich
 -# Copyright (C) 2009-2013  Simon Ruderich
++# Copyright (C) 2009-2012  Simon Ruderich
  #
  # This program is free software: you can redistribute it and/or modify
  # it under the terms of the GNU General Public License as published by
@@@ -22,17 -22,6 +22,22 @@@ set -
  
  . ../lib.sh
  
 +# gdb, GNU debugger.
 +if installed gdb; then
 +    link gdbinit ~/.gdbinit
 +fi
 +
++# Powerful FTP client.
+ if installed lftp; then
+     link lftp ~/.lftp
+ fi
++
 +# Maxima, a symbolic algebra program.
 +if installed maxima; then
 +    link maxima ~/.maxima
 +fi
 +
 +# perlcritic to check Perl programs for common problems.
 +if installed perlcritic; then
 +    link perl/perlcriticrc ~/.perlcriticrc
 +fi