From 4912967eabc447c31847566f03c50433015e9e9c Mon Sep 17 00:00:00 2001
From: ridiculousfish <corydoras@ridiculousfish.com>
Date: Sun, 8 Jul 2012 15:20:39 -0700
Subject: Large set of changes related to making fish relocatable, and
 improving the build and install story. - etc/config.fish and
 share/config.fish are now "universal" and no longer reference install paths
 or need to be touched by autotools. They've been removed from config.fish.in
 to config.fish. - fish now attempts to determine __fish_datadir and
 __fish_sysconfdir relative to the path of the fish executable itself
 (typically by walking up one directory). This means that you can copy the
 directory hierarchy around and things will still work. The compiled-in paths
 are used as a backup. - The fish Xcode project now can build fish natively,
 without needing autotools. - Version bumped to 2.0

---
 etc/config.fish    | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 etc/config.fish.in | 50 --------------------------------------------------
 2 files changed, 49 insertions(+), 50 deletions(-)
 create mode 100644 etc/config.fish
 delete mode 100644 etc/config.fish.in

(limited to 'etc')

diff --git a/etc/config.fish b/etc/config.fish
new file mode 100644
index 00000000..a3f3b9f3
--- /dev/null
+++ b/etc/config.fish
@@ -0,0 +1,49 @@
+#
+# Init file for fish
+#
+
+#
+# Some things should only be done for login terminals
+#
+
+if status --is-login
+
+	#
+	# Set some value for LANG if nothing was set before, and this is a
+	# login shell.
+	#
+
+	if not set -q LANG >/dev/null
+		set -gx LANG en_US.UTF-8
+	end
+
+	# Check for i18n information in
+	# /etc/sysconfig/i18n
+
+	if test -f /etc/sysconfig/i18n
+		eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
+	end
+
+	#
+	# Put linux consoles in unicode mode.
+	#
+
+	if expr "$LANG" : ".*\.[Uu][Tt][Ff].*" >/dev/null
+		if test "$TERM" = linux
+			if which unicode_start >/dev/null
+				unicode_start
+			end
+		end
+	end
+end
+
+#
+# Load additional initialization files
+#
+
+if test -d include
+	for i in include/*.fish
+		. $i
+	end
+end
+
diff --git a/etc/config.fish.in b/etc/config.fish.in
deleted file mode 100644
index 5e4ed67b..00000000
--- a/etc/config.fish.in
+++ /dev/null
@@ -1,50 +0,0 @@
-#
-# Init file for fish
-#
-# @configure_input@
-
-#
-# Some things should only be done for login terminals
-#
-
-if status --is-login
-
-	#
-	# Set some value for LANG if nothing was set before, and this is a
-	# login shell.
-	#
-
-	if not set -q LANG >/dev/null
-		set -gx LANG en_US.UTF-8
-	end
-
-	# Check for i18n information in
-	# /etc/sysconfig/i18n
-
-	if test -f /etc/sysconfig/i18n
-		eval (cat /etc/sysconfig/i18n |sed -ne 's/^\([a-zA-Z]*\)=\(.*\)$/set -gx \1 \2;/p')
-	end
-
-	#
-	# Put linux consoles in unicode mode.
-	#
-
-	if expr "$LANG" : ".*\.[Uu][Tt][Ff].*" >/dev/null
-		if test "$TERM" = linux
-			if which unicode_start >/dev/null
-				unicode_start
-			end
-		end
-	end
-end
-
-#
-# Load additional initialization files
-#
-
-if test -d include
-	for i in include/*.fish
-		. $i
-	end
-end
-
-- 
cgit v1.2.3