Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
660d8e1
Merge pull request #332 from LizardByte/nightly
ReenigneArcher Oct 30, 2022
1e6d9da
Merge pull request #456 from LizardByte/nightly
ReenigneArcher Oct 30, 2022
8509ee7
Merge pull request #458 from LizardByte/nightly
ReenigneArcher Oct 30, 2022
e1b112c
Merge pull request #460 from LizardByte/nightly
ReenigneArcher Oct 31, 2022
5e2dde4
Add install script
istori1 Nov 2, 2022
86db3d5
Add files via upload
istori1 Nov 2, 2022
07e2813
Add files via upload
istori1 Nov 2, 2022
b13c785
Update dev.lizardbyte.sunshine.yml
istori1 Nov 2, 2022
cb61217
Merge branch 'LizardByte:master' into patch-1
istori1 Nov 3, 2022
e999249
Update dev.lizardbyte.sunshine.yml
istori1 Nov 3, 2022
ed53bcc
Rename install-mouse to install-mouse.sh
istori1 Nov 3, 2022
3bd54f1
Rename remove-mouse to remove-mouse.sh
istori1 Nov 3, 2022
e398388
Update dev.lizardbyte.sunshine.yml
istori1 Nov 3, 2022
70a8b69
Update install-mouse.sh
istori1 Nov 3, 2022
4aefb3f
Add files via upload
istori1 Nov 3, 2022
3410450
Delete install-mouse.sh
istori1 Nov 3, 2022
2338cd9
Delete remove-mouse.sh
istori1 Nov 3, 2022
f322579
Update dev.lizardbyte.sunshine.yml
istori1 Nov 3, 2022
b0e5954
Update dev.lizardbyte.sunshine.yml
istori1 Nov 3, 2022
3786d78
Merge pull request #1 from istori1/istori1-patch-1
istori1 Nov 3, 2022
303df90
Update dev.lizardbyte.sunshine.yml
istori1 Nov 3, 2022
ae09bd7
Update dev.lizardbyte.sunshine.yml
istori1 Nov 3, 2022
83cd771
Merge pull request #2 from istori1/istori1-patch-1
istori1 Nov 3, 2022
41cf2e5
Merge branch 'nightly' into patch-1
istori1 Nov 3, 2022
f2800a3
Add files via upload
istori1 Nov 3, 2022
0a98b54
Update dev.lizardbyte.sunshine.yml
istori1 Nov 4, 2022
d222c46
Update install-user-service.sh
istori1 Nov 4, 2022
f81caed
Merge pull request #3 from istori1/istori1-patch-1
istori1 Nov 4, 2022
64d4cc0
Update dev.lizardbyte.sunshine.yml
istori1 Nov 5, 2022
0930751
Update install-user-service.sh
istori1 Nov 5, 2022
3d92884
Add files via upload
istori1 Nov 5, 2022
57939c3
Delete install-mouse.sh
istori1 Nov 5, 2022
94e2abc
Delete install-user-service.sh
istori1 Nov 5, 2022
6afc241
Delete remove-mouse.sh
istori1 Nov 5, 2022
5b33892
Delete remove-user-service.sh
istori1 Nov 5, 2022
f5f55c1
Merge pull request #4 from istori1/istori1-patch-1
istori1 Nov 5, 2022
a74c64d
Update additional-install.sh
istori1 Nov 5, 2022
8005d63
Update installation.rst
istori1 Nov 5, 2022
ed51c99
Update installation.rst
istori1 Nov 5, 2022
002d89f
Update installation.rst
istori1 Nov 5, 2022
b1ff426
Merge pull request #5 from istori1/istori1-patch-1
istori1 Nov 5, 2022
3c7657d
Update installation.rst
istori1 Nov 8, 2022
2332f91
Update installation.rst
istori1 Nov 8, 2022
6fc975f
Update usage.rst
istori1 Nov 8, 2022
3bb3b5c
Merge pull request #6 from istori1/istori1-patch-1
istori1 Nov 8, 2022
557c6dc
Update usage.rst
istori1 Nov 8, 2022
878f991
Update installation.rst
istori1 Nov 9, 2022
81f55df
Merge branch 'nightly' into patch-1
istori1 Nov 18, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions docs/source/about/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -104,17 +104,24 @@ Flatpak Package
:alt: GitHub issues by-label

#. Install `Flatpak <https://flatpak.org/setup/>`_ as required.
#. Download ``sunshine.flatpak`` and run the following code.
#. Download ``sunshine_{arch}.flatpak`` and run the following code.

.. Note:: Be sure to replace ``{arch}`` with the architecture for your operating system.

System level (recommended)
.. code-block:: bash

flatpak install --system sunshine.flatpak
flatpak install --system ./sunshine_{arch}.flatpak

User level
.. code-block:: bash

flatpak install --user sunshine.flatpak
flatpak install --user ./sunshine_{arch}.flatpak

Additional installation (required)
.. code-block:: bash

flatpak run --command=additional-install.sh dev.lizardbyte.sunshine
Comment on lines +121 to +124
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add this code to each sub section (system and user level) instead of making a new sub section.

And if you agree to rename the scripts, change the name here as well.


Start:
X11 and NVFBC capture (X11 Only)
Expand All @@ -130,7 +137,8 @@ Start:
Uninstall:
.. code-block:: bash

flatpak uninstall --delete-data sunshine.flatpak
flatpak run --command=remove-additional-install.sh dev.lizardbyte.sunshine
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you agree to rename the scripts, change the name here as well.

flatpak uninstall --delete-data dev.lizardbyte.sunshine

RPM Package
^^^^^^^^^^^
Expand Down
7 changes: 4 additions & 3 deletions docs/source/about/usage.rst
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@ Setup

Linux
^^^^^
The `deb`, `rpm`, and `AppImage` packages handle these steps automatically. The flatpak does not, third party packages
also may not.
The `deb`, `rpm`, `Flatpak` and `AppImage` packages handle these steps automatically. Third party packages may not.

Sunshine needs access to `uinput` to create mouse and gamepad events.

Expand All @@ -81,6 +80,8 @@ Sunshine needs access to `uinput` to create mouse and gamepad events.

[Service]
ExecStart=<see table>
#Flatpak Only
#ExecStop=flatpak kill dev.lizardbyte.sunshine

[Install]
WantedBy=graphical-session.target
Expand All @@ -95,7 +96,7 @@ Sunshine needs access to `uinput` to create mouse and gamepad events.
deb /usr/bin/sunshine ✔
rpm /usr/bin/sunshine ✔
AppImage ~/sunshine.AppImage ✔
Flatpak flatpak run dev.lizardbyte.sunshine
Flatpak flatpak run dev.lizardbyte.sunshine
======== ============================================== ===============

**Start once**
Expand Down
4 changes: 4 additions & 0 deletions packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,3 +208,7 @@ modules:
- sed -r -z -i -e
's/("((do)|(undo)|(cmd)|(detached))"\s*:\s*\[?\n*\s*")(.*")/\1flatpak-spawn --host \7/gm'
/app/share/sunshine/apps.json
- sed -i
's%/app/bin/sunshine%flatpak run dev.lizardbyte.sunshine\nExecStop=flatpak kill dev.lizardbyte.sunshine%g'
/app/share/sunshine/systemd/user/sunshine.service
- install -D $FLATPAK_BUILDER_BUILDDIR/packaging/linux/flatpak/scripts/* /app/bin
13 changes: 13 additions & 0 deletions packaging/linux/flatpak/scripts/additional-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we just rename to install.sh ?


# User Service
mkdir -p ~/.config/systemd/user
cp /app/share/sunshine/systemd/user/sunshine.service $HOME/.config/systemd/user/sunshine.service
echo Sunshine User Service has been installed.
echo Use [systemctl --user enable sunshine] once to autostart Sunshine on login.

# Udev rule and input group
UDEV=$(cat /app/share/sunshine/udev/rules.d/85-sunshine.rules)
echo Configuring mouse permission.
flatpak-spawn --host pkexec sh -c "usermod -a -G input $USER && echo '$UDEV' > /etc/udev/rules.d/85-sunshine.rules"
echo Restart computer for mouse permission to take effect.
11 changes: 11 additions & 0 deletions packaging/linux/flatpak/scripts/remove-additional-install.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we just rename to remove.sh?


# User Service
systemctl --user stop sunshine
rm $HOME/.config/systemd/user/sunshine.service
systemctl --user daemon-reload
echo Sunshine User Service has been removed.

# Udev rule and input group
flatpak-spawn --host pkexec sh -c "gpasswd -d $USER input && rm /etc/udev/rules.d/85-sunshine.rules"
echo Mouse permission removed. Restart computer to take effect.