Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use default location of FvwmMFL socket in FvwmCommand. #835

Merged
merged 1 commit into from Mar 14, 2023
Merged

Use default location of FvwmMFL socket in FvwmCommand. #835

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 11 additions & 4 deletions bin/FvwmCommand.in
View file
Open in desktop
Expand Up @@ -18,11 +18,18 @@ def mflclnt(verbose, read_from_stdin, info, fvwm_socket, args):
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)

# Connect the socket to the "port" where the server is listening
# FvwmMFL is setting this in environment, so we can really treat
# absence of the environment FVWMMFL_SOCKET as error, except when
# explicit -f <sockname> has been specified by the user.
# FvwmMFL is setting this in environment. This is done by using
# the explicit -f <sockname> flag if it is provided, otherwise
# use the environment FVWMMFL_SOCKET if it is defined, then fall
# back to TMPDIR/fvwm_mfl.sock if TMPDIR is defined, and last use
# the default location /tmp/fvwm_mfl.sock.
if not fvwm_socket:
fvwm_socket = str(os.environ.get('FVWMMFL_SOCKET'))
if 'FVWMMFL_SOCKET' in os.environ:
fvwm_socket = str(os.environ.get('FVWMMFL_SOCKET'))
elif 'TMPDIR' in os.environ:
fvwm_socket = str(os.environ.get('TMPDIR')) + '/fvwm_mfl.sock'
else:
fvwm_socket = '/tmp/fvwm_mfl.sock'
def_socket = True
else:
def_socket = False
Expand Down