diff --git a/NEWS b/NEWS index 4b3d5c4c..6213ddbb 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,6 @@ +0.5.3: +* switch LASH_START_SERVER for LASH_NO_START_SERVER with opposite semantics + 0.5.2: * support for building without ALSA * server auto-launching bug fixes diff --git a/docs/lash-manual.info b/docs/lash-manual.info index eb7e8b7f..61d729ca 100644 --- a/docs/lash-manual.info +++ b/docs/lash-manual.info @@ -280,24 +280,28 @@ listening for connections from clients. It doesn't do much else. `lash_panel' program (though this is not necessary, and it can be started later at any time). - The environment variable `LASH_START_SERVER' can be set to have any -LASH client automatically start the server if one isn't already running. -Doing this you can simply put `lash_panel' (or any other LASH client) -in your applications menu and have LASH automatically work without -having to remember to start the server manually. + Unless the environment variable `LASH_NO_START_SERVER' is set any +LASH client will automatically start the server if one isn't already running. +Doing this you can simply run applications normally (e.g. from a terminal or +your Applications menu) and have LASH automatically work without having to +remember to start the server manually. - Starting the server can be disabled by specifying the + Starting the server can also be disabled by specifying the `--lash-no-start-server' option on the client's command line. If you're using a Bourne compatible shell like `bash' (if you don't -know, you probably are) you can enable auto-start with the following +know, you probably are) you can disable auto-start with the following command: - `export LASH_START_SERVER=1' + `export LASH_NO_START_SERVER=1' + + Some applications may also choose themselves whether to start the +server (or have a configurable option). + + Disabling the automatic start is not recommended to gain the abilities LASH +intends to provide. With auto launching enabled you don't need to worry about +LASH until you actually want to save a session. - If you would like to always have the server started, put that -command in the file ~/.bashrc (or in /etc/profile if you are root and -want it set system wide) to have it run whenever a new shell is started. 6.1.1.2 A client connection ........................... diff --git a/docs/lash-manual.texi.in b/docs/lash-manual.texi.in index 73805025..77958f6f 100644 --- a/docs/lash-manual.texi.in +++ b/docs/lash-manual.texi.in @@ -306,23 +306,26 @@ To keep track of what is happening with LASH, the user can run the @command{lash_panel} program (though this is not necessary, and it can be started later at any time). -The environment variable @code{LASH_START_SERVER} can be set to have any -LASH client automatically start the server if one isn't already running. -Doing this you can simply put @command{lash_panel} (or any other LASH -client) in your applications menu and have LASH automatically work without -having to remember to start the server manually. +Unless the environment variable @code{LASH_NO_START_SERVER} is set any +LASH client will automatically start the server if one isn't already running. +Doing this you can simply run applications normally (e.g. from a terminal or +your Applications menu) and have LASH automatically work without having to +remember to start the server manually. -Starting the server can be disabled by specifying the -@option{--lash-no-start-server} option on the client's command line. +Starting the server can also be disabled by specifying the +@command{--lash-no-start-server} option on the client's command line. -If you're using a Bourne compatible shell like @command{bash} (if you don't -know, you probably are) you can enable auto-start with the following command: +If you're using a Bourne compatible shell like @code{bash} (if you don't +know, you probably are) you can disable auto-start with the following +command: -@command{export LASH_START_SERVER=1} +@command{export LASH_NO_START_SERVER=1} -If you would like to always have the server started, put that command in the -file ~/.bashrc (or in /etc/profile if you are root and want it set system -wide) to have it run whenever a new shell is started. +Some applications may also choose themselves whether to start the +server (or have a configurable option), however risabling the automatic +start (by any method) is not recommended if you want to gain the benefits of +LASH. With auto launching enabled you don't need to worry about +LASH until you actually want to save a session. @subsubsection A client connection diff --git a/liblash/lash.c b/liblash/lash.c index 6378403c..87693395 100644 --- a/liblash/lash.c +++ b/liblash/lash.c @@ -186,7 +186,7 @@ lash_init(const lash_args_t * args, case something must be broken if we can't connect */ if ( !(client_flags & LASH_No_Start_Server) ) { lash_args_get_id(args, id); - if (err && getenv("LASH_START_SERVER") != NULL && uuid_is_null(id)) { + if (err && getenv("LASH_NO_START_SERVER") == NULL && uuid_is_null(id)) { LASH_DEBUGARGS("%s: trying to start new LASH server\n", __FUNCTION__);