Redo installation file structure, move lots of things to $PREFIX/share/fish

darcs-hash:20060217101339-ac50b-d93d2c620a4b7f75f05ff461a6edbee001da7613.gz

3 files changed, 234 insertions, 0 deletions

diff --git a/etc/fish b/etc/fish
new file mode 100644
index 00000000..8c170a6c
--- /dev/null
+++ b/etc/fish
@@ -0,0 +1,103 @@
+#
+# Init file for fish
+#
+# etc/fish.  Generated from fish.in by configure.
+
+#
+# Set default search paths
+#
+
+set -g fish_function_path /usr/share/functions /etc/fish.d/functions ~/.fish.d/functions
+set -g fish_complete_path /usr/share/completions /etc/fish.d/completions ~/.fish.d/completions
+
+#
+# Set default field separators
+#
+
+set -g IFS \ \t\n
+
+#
+# Add a few common directories to path, if they exists. Note that pure
+# console programs like makedep sometimes live in /usr/X11R6/bin, so we
+# want this even for text-only terminals.
+#
+
+set -l path_list /bin /usr/bin /usr/X11R6/bin /usr/bin  /sw/bin
+
+# Root should also have the sbin directories in the path
+if test "$USER" = root
+	set path_list $path_list /sbin /usr/sbin /usr/local/sbin
+end
+
+for i in $path_list
+	if not expr "$PATH" : .\*$i.\* >/dev/null
+		if test -d $i
+			set PATH $PATH $i
+		end
+	end
+end
+
+
+#
+# Set some value for LANG if nothing was set before, and this is a
+# login shell. Also check for i18n information in /etc/sysconfig/i18n
+#
+
+if status --is-login
+	if not set -q LANG >/dev/null
+		set -gx LANG en_US.UTF-8
+	end
+
+	if test -f /etc/sysconfig/i18n
+		eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
+	end
+end
+
+
+#
+# Put linux console in unicode mode. Should this be done in any other
+# situation as well?
+#
+
+if expr "$LANG" : ".*[Uu][Tt][Ff]" >/dev/null
+	if test linux = "$TERM"
+		unicode_start ^/dev/null
+	end
+end
+
+
+#
+# There are variables that contain colons that are not arrays. This 
+# reverts them back to regular strings.
+#
+
+for i in DISPLAY
+	if set -q $i
+		set -- $i (printf ":%s" $$i|cut -c 2-)
+	end
+end
+
+#
+# Alias for gettext (or a fallback if gettext isn't installed) This
+# needs to be defined here and not in fish_function.fish, since it is
+# used by other init files.
+#
+
+function _ -d "Alias for the gettext command"
+	printf "%s" $argv
+end
+if test 1 = "1"
+	if which gettext ^/dev/null >/dev/null
+		function _ -d "Alias for the gettext command"
+			gettext fish $argv
+		end
+	end
+end
+
+#
+# Load additional initialization files
+#
+
+for i in fish.d/*.fish
+	. $i
+end
diff --git a/etc/fish.in b/etc/fish.in
new file mode 100644
index 00000000..b010c31a
--- /dev/null
+++ b/etc/fish.in
@@ -0,0 +1,103 @@
+#
+# Init file for fish
+#
+# @configure_input@
+
+#
+# Set default search paths
+#
+
+set -g fish_function_path ~/.fish.d/functions    @SYSCONFDIR@/fish.d/functions    @DATADIR@/functions 
+set -g fish_complete_path ~/.fish.d/completions  @SYSCONFDIR@/fish.d/completions  @DATADIR@/completions 
+
+#
+# Set default field separators
+#
+
+set -g IFS \ \t\n
+
+#
+# Add a few common directories to path, if they exists. Note that pure
+# console programs like makedep sometimes live in /usr/X11R6/bin, so we
+# want this even for text-only terminals.
+#
+
+set -l path_list /bin /usr/bin /usr/X11R6/bin @PREFIX@/bin @optbindirs@
+
+# Root should also have the sbin directories in the path
+if test "$USER" = root
+	set path_list $path_list /sbin /usr/sbin /usr/local/sbin
+end
+
+for i in $path_list
+	if not expr "$PATH" : .\*$i.\* >/dev/null
+		if test -d $i
+			set PATH $PATH $i
+		end
+	end
+end
+
+
+#
+# Set some value for LANG if nothing was set before, and this is a
+# login shell. Also check for i18n information in /etc/sysconfig/i18n
+#
+
+if status --is-login
+	if not set -q LANG >/dev/null
+		set -gx LANG en_US.UTF-8
+	end
+
+	if test -f /etc/sysconfig/i18n
+		eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
+	end
+end
+
+
+#
+# Put linux console in unicode mode. Should this be done in any other
+# situation as well?
+#
+
+if expr "$LANG" : ".*[Uu][Tt][Ff]" >/dev/null
+	if test linux = "$TERM"
+		unicode_start ^/dev/null
+	end
+end
+
+
+#
+# There are variables that contain colons that are not arrays. This 
+# reverts them back to regular strings.
+#
+
+for i in DISPLAY
+	if set -q $i
+		set -- $i (printf ":%s" $$i|cut -c 2-)
+	end
+end
+
+#
+# Alias for gettext (or a fallback if gettext isn't installed) This
+# needs to be defined here and not in fish_function.fish, since it is
+# used by other init files.
+#
+
+function _ -d "Alias for the gettext command"
+	printf "%s" $argv
+end
+if test 1 = "@HAVE_GETTEXT@"
+	if which gettext ^/dev/null >/dev/null
+		function _ -d "Alias for the gettext command"
+			gettext fish $argv
+		end
+	end
+end
+
+#
+# Load additional initialization files
+#
+
+for i in fish.d/*.fish
+	. $i
+end
diff --git a/etc/fish_inputrc b/etc/fish_inputrc
new file mode 100644
index 00000000..fefdd55e
--- /dev/null
+++ b/etc/fish_inputrc
@@ -0,0 +1,28 @@
+#
+# This file contains key bindings for fish
+#
+
+# Include system-wide inputrc file before including fish-specific key
+# bindings if it exists
+
+$include /etc/inputrc
+
+$if fish
+	"\M-l": __fish_list_current_token
+	"\M-w": set tok (commandline -pt); if test $tok[1]; whatis $tok[1]; end
+	"\C-l": clear
+	"\C-c": delete-line		
+	"\C-u": backward-kill-line
+	"\M-d": kill-word
+	"\C-w": backward-kill-word	
+	"\M-k": dump-functions
+	"\M-d": if test -z (commandline); dirh; else; commandline -f kill-word; end
+	"\C-d": delete-or-exit	
+# This will make sure the output of the current command is paged using the less pager when you press Meta-p
+	"\M-p": if commandline -j|grep -v 'less *$' >/dev/null; commandline -aj "|less;"; end
+$endif
+
+# Include user-specific inputrc file after including fish-specific
+# bindings so that they will override fish defaults
+
+$include ~/.inputrc