From 843348160762dae6d58ec8ccf1507659b973420f Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Thu, 15 Sep 2016 00:00:48 -0400 Subject: [PATCH] moopish --- scripts/core/generate_aliases.pl | 9 +++++---- scripts/core/launch_feisty_meow.sh | 16 +++++++++------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/scripts/core/generate_aliases.pl b/scripts/core/generate_aliases.pl index 726a0bbf..eb6775e8 100644 --- a/scripts/core/generate_aliases.pl +++ b/scripts/core/generate_aliases.pl @@ -152,10 +152,11 @@ sub rebuild_script_aliases { # make sure we know where to store the files we're creating. if ( ! length("$FEISTY_MEOW_LOADING_DOCK") ) { print "\ -The FEISTY_MEOW_LOADING_DOCK variable is not defined. This must point to the location where\n\ -the generated scripts are stored. Perhaps you still need to run\n\ -reconfigure_feisty_meow.sh and set up some environment variables. Please see\n\ -http://feistymeow.org for more details.\n"; +The FEISTY_MEOW_LOADING_DOCK variable is not defined. This must point to\ +the location where the generated scripts are stored. You may still need to\ +configure the feisty meow script system with something like:\ + bash ~/feisty_meow/scripts/core/reconfigure_feisty_meow.sh\ +Please see http://feistymeow.org for more details.\n"; exit 1; #really need to use better exit codes. } diff --git a/scripts/core/launch_feisty_meow.sh b/scripts/core/launch_feisty_meow.sh index c130a00a..b3d52052 100644 --- a/scripts/core/launch_feisty_meow.sh +++ b/scripts/core/launch_feisty_meow.sh @@ -102,13 +102,15 @@ if [ -z "$LIGHTWEIGHT_INIT" ]; then source "$FEISTY_MEOW_LOADING_DOCK/fmc_core_and_custom_aliases.sh" fi - # allow connections to our x server from the local host. - if [ ! -z "$DISPLAY" ]; then - if [ ! -z "$(echo "$OS_TYPE" | grep -i darwin)" ]; then - if [ ! -z "$SHELL_DEBUG" ]; then echo "Enabling localhost X connections..."; fi - xhost + localhost >/dev/null 2>&1 - fi - fi +## disabled since we don't think is needed any more, and it's just an +## attack surface if the other users on the host are not trusted. +# # allow connections to our x server from the local host. +# if [ ! -z "$DISPLAY" ]; then +# if [ ! -z "$(echo "$OS_TYPE" | grep -i darwin)" ]; then +# if [ ! -z "$SHELL_DEBUG" ]; then echo "Enabling localhost X connections..."; fi +# xhost + localhost >/dev/null 2>&1 +# fi +# fi # a minor tickle of the title of the terminal, in case there is one. bash $FEISTY_MEOW_SCRIPTS/tty/label_terminal_with_infos.sh -- 2.34.1