couple of cleanups to remove old aliases, start up better.

[feisty_meow.git] / scripts / core / unter_alia.sh

diff --git a/scripts/core/unter_alia.sh b/scripts/core/unter_alia.sh
index a0c14974201bd36543ce5ce8b24b643f6312dc46..ed3e32eb8538c4cbc0b83d21cb3cea10c5f83890 100644 (file)
--- a/scripts/core/unter_alia.sh
+++ b/scripts/core/unter_alia.sh
@@ -29,11 +29,11 @@ if [ ! -d $GENERADIR ]; then mkdir $GENERADIR; fi
 test_color=$(ls --help 2>&1 | grep -i color)
 
 export COMMON_FILES=$SHELLDIR/core/common_aliases.txt
-if [ -f "$SHELLDIR/custom/c_common_aliases.txt" ]; then
-  # if the custom aliases file exists, add it to the list.
-  export COMMON_FILES="$COMMON_FILES $SHELLDIR/custom/c_common_aliases.txt"
-fi
-#echo common files is... $COMMON_FILES
+# if custom aliases files exist, add them to the list.
+for i in "$SHELLDIR/custom/*.txt"; do
+  COMMON_FILES+=" $i"
+done
+echo -e "Found alias files:\n$COMMON_FILES"
 
 # write the aliases for sh and bash scripts.
 
@@ -56,16 +56,19 @@ fi
 
 # we process the alias file to add the word "alias" to the first of every
 # line that's not a comment.
-cat $COMMON_FILES | sed -e 's/^\([^#]\)/alias \1/' >>$ALIASES_FILE 
-echo "##" >>$ALIASES_FILE
-echo "## now including shell specific additions..." >>$ALIASES_FILE
-echo "##" >>$ALIASES_FILE
-# then just dump the sh specific alias stuff into the file.
-cat $SHELLDIR/core/sh_aliases.txt >>$ALIASES_FILE 
+#cat $COMMON_FILES | sed -e 's/^\([^#]\)/alias \1/' >>$ALIASES_FILE 
+#nope: we no longer do that.
+
+cat $COMMON_FILES >>$ALIASES_FILE 
+
+#echo "##" >>$ALIASES_FILE
+#echo "## now including shell specific additions..." >>$ALIASES_FILE
+#echo "##" >>$ALIASES_FILE
+## then just dump the sh specific alias stuff into the file.
+#cat $SHELLDIR/core/sh_aliases.txt >>$ALIASES_FILE 
 # add in customized sh aliases if they exist.
-if [ -f "$SHELLDIR/custom/c_sh_aliases.txt" ]; then
-  cat $SHELLDIR/custom/c_sh_aliases.txt >>$ALIASES_FILE 
-fi
+#if [ -f "$SHELLDIR/custom/c_sh_aliases.txt" ]; then
+#  cat $SHELLDIR/custom/c_sh_aliases.txt >>$ALIASES_FILE 
+#fi
 
-exit 0;