mirror of
https://github.com/swaywm/sway.git
synced 2026-04-28 06:46:26 -04:00
Move swayrun outside of PATH
Because swayrun is not intended to be called directly by users, it is moved to /usr/lib. The sway.desktop wayland session file is also updated to reflect this new location.
This commit is contained in:
parent
eb22dee79c
commit
9b10a16775
4 changed files with 10 additions and 35 deletions
11
meson.build
11
meson.build
|
|
@ -30,6 +30,7 @@ cc = meson.get_compiler('c')
|
||||||
|
|
||||||
is_freebsd = host_machine.system().startswith('freebsd')
|
is_freebsd = host_machine.system().startswith('freebsd')
|
||||||
datadir = get_option('datadir')
|
datadir = get_option('datadir')
|
||||||
|
libdir = get_option('libdir')
|
||||||
sysconfdir = get_option('sysconfdir')
|
sysconfdir = get_option('sysconfdir')
|
||||||
prefix = get_option('prefix')
|
prefix = get_option('prefix')
|
||||||
|
|
||||||
|
|
@ -106,8 +107,7 @@ if scdoc.found()
|
||||||
'sway/sway-output.5.scd',
|
'sway/sway-output.5.scd',
|
||||||
'swaymsg/swaymsg.1.scd',
|
'swaymsg/swaymsg.1.scd',
|
||||||
'swaynag/swaynag.1.scd',
|
'swaynag/swaynag.1.scd',
|
||||||
'swaynag/swaynag.5.scd',
|
'swaynag/swaynag.5.scd'
|
||||||
'swayrun/swayrun.1.scd'
|
|
||||||
]
|
]
|
||||||
foreach filename : man_files
|
foreach filename : man_files
|
||||||
topic = filename.split('.')[-3].split('/')[-1]
|
topic = filename.split('.')[-3].split('/')[-1]
|
||||||
|
|
@ -154,6 +154,7 @@ subdir('swayrun')
|
||||||
|
|
||||||
config = configuration_data()
|
config = configuration_data()
|
||||||
config.set('datadir', join_paths(prefix, datadir))
|
config.set('datadir', join_paths(prefix, datadir))
|
||||||
|
config.set('libdir', join_paths(prefix, libdir))
|
||||||
config.set('prefix', prefix)
|
config.set('prefix', prefix)
|
||||||
config.set('sysconfdir', join_paths(prefix, sysconfdir))
|
config.set('sysconfdir', join_paths(prefix, sysconfdir))
|
||||||
|
|
||||||
|
|
@ -180,8 +181,10 @@ else
|
||||||
)
|
)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
install_data(
|
configure_file(
|
||||||
'sway.desktop',
|
configuration: config,
|
||||||
|
input: 'sway.desktop.in',
|
||||||
|
output: '@BASENAME@',
|
||||||
install_dir: datadir + '/wayland-sessions'
|
install_dir: datadir + '/wayland-sessions'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Name=Sway
|
Name=Sway
|
||||||
Comment=SirCmpwn's Wayland window manager
|
Comment=SirCmpwn's Wayland window manager
|
||||||
Exec=swayrun
|
Exec=@libdir@/sway/swayrun
|
||||||
Type=Application
|
Type=Application
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
executable(
|
executable(
|
||||||
'swayrun',
|
'swayrun',
|
||||||
'main.c',
|
'main.c',
|
||||||
install: true
|
install: true,
|
||||||
|
install_dir: libdir + '/sway'
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
swayrun(1)
|
|
||||||
|
|
||||||
# NAME
|
|
||||||
|
|
||||||
swayrun - Run Sway from a login shell
|
|
||||||
|
|
||||||
# SYNOPSIS
|
|
||||||
|
|
||||||
_swayrun_ [options...] [command]
|
|
||||||
|
|
||||||
# DESCRIPTION
|
|
||||||
|
|
||||||
Attempts to run *sway*(1) via the user's login shell. This allows environment
|
|
||||||
configuration and other login actions, for example when run via a display manager.
|
|
||||||
|
|
||||||
All arguments to swayrun will be passed through unaltered to sway.
|
|
||||||
|
|
||||||
If a login shell cannot be determined, sway will be executed normally.
|
|
||||||
|
|
||||||
# ENVIRONMENT
|
|
||||||
|
|
||||||
The following environment variables have an effect on swayrun:
|
|
||||||
|
|
||||||
_SHELL_
|
|
||||||
Holds the path to the login shell.
|
|
||||||
|
|
||||||
# SEE
|
|
||||||
|
|
||||||
*sway*(1)
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue