fixed ls colors

diff --git a/scripts/core/generate_aliases.pl b/scripts/core/generate_aliases.pl
index 775a1719a54d62f2d0c1d19c876551c6b51a1766..50e4bd5676780b0c0868382f63fd0671c2187962 100644 (file)
--- a/scripts/core/generate_aliases.pl
+++ b/scripts/core/generate_aliases.pl
@@ -91,7 +91,7 @@ sub rebuild_script_aliases {
   }
 
   # test if we can use color in ls...
-  $test_color=` ls --help 2>&1 | grep -i color `;
+#  $test_color=` ls --help 2>&1 | grep -i color `;
 
   # this is an array of files from which to draw alias definitions.
   @ALIAS_DEFINITION_FILES = ("$FEISTY_MEOW_SCRIPTS/core/common.alias");
@@ -126,11 +126,11 @@ sub rebuild_script_aliases {
   print GENOUT "## please do not edit.\n";
   print GENOUT "##\n";
 
-  if (length($test_color)) {
-    print GENOUT "export color_add=--color=auto\n";
-  } else {
-    print GENOUT "export color_add=\n";
-  }
+#  if (length($test_color)) {
+#    print GENOUT "export color_add='--color=auto'\n";
+#  } else {
+#    print GENOUT "export color_add=\n";
+#  }
 
   # plow in the full set of aliases into the file.
   foreach $i (@ALIAS_DEFINITION_FILES) {

diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 9cecadf848a57d8bfb24090c9fdcb58e155f3138..b3119ae55c96e584928a60e47cf417f6e04e4ed9 100644 (file)
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -130,7 +130,20 @@ if [ -z "$CORE_VARIABLES_LOADED" ]; then
   fi
   
   ##############
+
+  # set up the color_add variable which is a flag that lets ls know colors work.
+
+  # test if we can use color in ls...
+  ls --help 2>&1 | grep -i -q color
+  if [ $? -eq 0 ]; then
+    export color_add='--color=auto'
+  else
+    export color_add=
+  fi
+  unset test_ls_colors
   
+  ##############
+
   # umask sets a permission mask for all file creations.
   # this mask disallows writes by "group" and "others".
   umask 022