Fish PATH Fix

Moved PATH detection code to the start of share/fish.

darcs-hash:20060313190724-c90d9-8e2e80910041e91b48d68154e9d8180d04689463.gz

Makefile.in

@@ -179,7 +179,7 @@ ETC_DIR_FILES :=etc/fish.in etc/fish_inputrc	\
 	etc/fish_interactive.fish.in
 
 # Files in ./share/
-SHARE_DIR_FILES :=share/fish
+SHARE_DIR_FILES :=share/fish.in
 
 # Files in ./tests/
 TESTS_DIR_FILES := $(TEST_IN) $(TEST_IN:.in=.out) $(TEST_IN:.in=.err)	\

configure.ac

@@ -292,7 +292,7 @@ else
 fi
 
 # Tell the world what we know
-AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile etc/fish etc/fish_interactive.fish seq])
+AC_CONFIG_FILES([Makefile fish.spec doc_src/fish.1 doc_src/Doxyfile etc/fish etc/fish_interactive.fish share/fish seq])
 AC_OUTPUT
 
 echo "fish is now configured."

etc/fish.in

@@ -24,10 +24,7 @@ set -g IFS \ \t\n
 
 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

share/fish.in

@@ -4,6 +4,27 @@
 # completions are located in the completions subdirectory.
 #
 
+#
+# 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
+
 #
 # Assign a temporary value here for performance reasons. The real value should be set in /etc/fish.
 #