From: Chris Koeritz <fred@gruntose.com>
Date: Thu, 23 Feb 2012 19:00:32 +0000 (-0500)
Subject: working drag and drop for files/folders to/fro client-ui.
X-Git-Tag: 2.140.90~1561
X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=0e02142eae5382bf3b3c29afe883a799f4007aaf;p=feisty_meow.git

working drag and drop for files/folders to/fro client-ui.
---

diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh
index e3f7d2ea..1db16783 100644
--- a/scripts/core/launch_feisty_meow.sh
+++ b/scripts/core/launch_feisty_meow.sh
@@ -73,7 +73,7 @@ if [ -z "$LIGHTWEIGHT_INIT" ]; then
   if [ ! -z "$SHELL_DEBUG" ]; then echo heavyweight login begins...; fi
 
   # set up the aliases for the shell, but only if they are not already set.
-  alias regenerated &>/dev/null  # see if a crucial alias exists.
+  alias regenerate &>/dev/null  # see if a crucial alias exists.
   if [ $? -ne 0 ]; then
     if [ ! -z "$SHELL_DEBUG" ]; then
       echo the aliases were missing, now they are added...
diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh
index 34198620..0f1ed10d 100644
--- a/scripts/core/variables.sh
+++ b/scripts/core/variables.sh
@@ -174,22 +174,6 @@ if [ -z "$NECHUNG" ]; then
   
   ##############
   
-  # pull in the custom overrides for feisty_meow scripts.  this is done last,
-  # because we want to set everything up as expected, then let the user
-  # override individual variables and definitions.
-  for i in $FEISTY_MEOW_GENERATED/custom/*.sh; do
-    if [ ! -f "$i" ]; then
-      # skip it if it's not real.
-      continue;
-    fi
-    if [ ! -z "$SHELL_DEBUG" ]; then
-      echo "loading customization: $(basename $(dirname $i))/$(basename $i)"
-    fi
-    source $i
-  done
-  
-  ##############
-  
   # set the path for locating applications.  this is done after any
   # potential overrides from the user.
   #export PATH="$(dos_to_msys_path $BINDIR):$(dos_to_msys_path $FEISTY_MEOW_GENERATED):$PATH:/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/lib:/usr/games:/usr/bin:."
@@ -202,3 +186,21 @@ if [ -z "$NECHUNG" ]; then
 
 fi
 
+##############
+
+# pull in the custom overrides for feisty_meow scripts.  this is done last,
+# because we want to set everything up as expected, then let the user
+# override individual variables and definitions.  we also don't guard this
+# to avoid running it again, because we don't know what mix of functions and
+# aliases they want to define in there.
+for i in $FEISTY_MEOW_GENERATED/custom/*.sh; do
+  if [ ! -f "$i" ]; then
+    # skip it if it's not real.
+    continue;
+  fi
+  if [ ! -z "$SHELL_DEBUG" ]; then
+    echo "loading customization: $(basename $(dirname $i))/$(basename $i)"
+  fi
+  source $i
+done
+