From 910207151846b89cb820581385cb09c8c9001320 Mon Sep 17 00:00:00 2001 From: Wouter Wijsman Date: Fri, 17 Jan 2020 15:15:04 +0100 Subject: [PATCH] Moved lutris-wrapper script It will now be placed in /usr/share/lutris/bin --- lutris/command.py | 2 +- setup.py | 3 +-- {bin => share/lutris/bin}/lutris-wrapper | 0 snapcraft.yaml | 3 --- 4 files changed, 2 insertions(+), 6 deletions(-) rename {bin => share/lutris/bin}/lutris-wrapper (100%) diff --git a/lutris/command.py b/lutris/command.py index 24ad8a9bf..2789b1fe0 100644 --- a/lutris/command.py +++ b/lutris/command.py @@ -16,7 +16,7 @@ from lutris import runtime from lutris.util.log import logger from lutris.util import system -WRAPPER_SCRIPT = os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), "lutris-wrapper") +WRAPPER_SCRIPT = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(sys.argv[0])), "../share/lutris/bin/lutris-wrapper")) class MonitoredCommand: diff --git a/setup.py b/setup.py index 618311ed0..6f3bb1f25 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,6 @@ for directory, _, filenames in os.walk(u'share'): files.append(filename) data_files.append((os.path.join('share', dest), files)) - setup( name='lutris', version=VERSION, @@ -43,7 +42,7 @@ setup( 'lutris.util.wine', 'lutris.vendor' ], - scripts=['bin/lutris', 'bin/lutris-wrapper'], + scripts=['bin/lutris'], data_files=data_files, zip_safe=False, install_requires=[ diff --git a/bin/lutris-wrapper b/share/lutris/bin/lutris-wrapper similarity index 100% rename from bin/lutris-wrapper rename to share/lutris/bin/lutris-wrapper diff --git a/snapcraft.yaml b/snapcraft.yaml index 2c4913212..d684c4ed0 100644 --- a/snapcraft.yaml +++ b/snapcraft.yaml @@ -112,9 +112,6 @@ apps: plugs: [home, daemon-notify, network, network-bind, network-manager, desktop, desktop-legacy, unity7, wayland, opengl, pulseaudio, gsettings, x11, screen-inhibit-control, kvm, libvirt, removable-media, joystick, io-ports-control, hardware-observe, mount-observe] slots: [ lutris ] desktop: share/applications/net.lutris.Lutris.desktop - - lutris-wrapper: - command: bin/desktop-launch $SNAP/bin/lutris-wrapper wine: command: bin/desktop-launch $SNAP/bin/wine