X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=scripts%2Fcore%2Flaunch_feisty_meow.sh;h=4a6184e687571f4a8c8404eaa09dd0e334eaa2b1;hb=12d3b0a9a2dae8d187318c52465fd262c74b0c85;hp=e1f2c9453c89e5d3383bf4c2ab09d76d689a716a;hpb=76134243c508eddabd496200bd142b2511141622;p=feisty_meow.git diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index e1f2c945..4a6184e6 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -19,7 +19,7 @@ ############## # this script cannot handle figuring out where it lives, so approaches that -# get the WORKDIR will fail. this is a consequence of this always being used +# get the THISDIR will fail. this is a consequence of this always being used # in bash's 'source' directive, which does not pass the script name as # argument 0. instead, we just check for the bad condition of a malconfigured # script system and try to repair it. @@ -92,6 +92,13 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then if [ -z "$USER" -a ! -z "$CRONUSER" ]; then export USER="$CRONUSER" fi + + # use the xauth info if we were given one in the environment. + # this allows root or other su'd identities to create windows with same + # display variable. + if [ ! -z "$DISPLAY" -a ! -z "$IMPORTED_XAUTH" ]; then + xauth add "$IMPORTED_XAUTH" + fi ############## @@ -228,6 +235,8 @@ if [ "$NO_REPAIRS_NEEDED" == "true" ]; then sep 28 echo fi + # from now on there should be no extra helloing. + export NO_HELLO=true fi # load the last bits we do here.