approach for sudo to have X windows working

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

diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh
index 08c9e9a00422caff1411c52e20649c3eb69756c5..865aa251e03b79f3ce3681d7c4f8e4ee2888a6ee 100644 (file)
--- a/scripts/core/functions.sh
+++ b/scripts/core/functions.sh
@@ -451,6 +451,9 @@ if [ -z "$skip_all" ]; then
   # label if they're doing an su with the sudo.
   function sudo() {
     save_terminal_title
+    # hoist our X authorization info in case environment is passed along;
+    # this can allow root to use our display to show Xorg windows.
+    export IMPORTED_XAUTH="$(xauth list $DISPLAY)"
     /usr/bin/sudo "$@"
     retval=$?
     restore_terminal_title
@@ -515,6 +518,8 @@ if [ -z "$skip_all" ]; then
         # if the user has sudo root access; we don't want to provide a custom
         # profile for root.
     fi
+    # chop off any email address style formatting to leave just the name.
+    custom_user="$(echo "$custom_user" | cut -f1 -d'@')"
 
     save_terminal_title
 
@@ -543,13 +548,23 @@ we will skip recustomization, but these other customizations are available:
       # there's an existing link, so remove it.
       \rm custom
     fi
+    # make sure we cleaned up the area before we re-link.
     if [ -h custom -o -d custom -o -f custom ]; then
       echo "
 Due to an over-abundance of caution, we are not going to remove an unexpected
-'custom' object in the file system.  This is located here:
-  $(pwd)
+'custom' object found in the file system.  This object is located in the
+feisty meow loading dock here: $(pwd)
+And here is a description of the rogue 'custom' object:
 "
-      ls -al .
+      ls -al custom
+      echo "
+If you are pretty sure that this is just a remnant of an older approach in
+feisty meow, where we copied the custom directory rather than linking it
+(and it most likely is just such a bit of cruft of that nature), then please
+remove that old remnant 'custom' item, for example by saying:
+  /bin/rm -rf \"custom\" ; popd
+Sorry for the interruption, but we want to make sure this removal wasn't
+automatic if there is even a small amount of doubt about the issue."
       return 1
     fi