From 5e2dde44acc94f91ec0c438976ddf1f89355f7e6 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Wed, 2 Nov 2022 07:24:44 -0400
Subject: [PATCH 01/35] Add install script

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index 7bb4cd1b7c5..c74023c8e50 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -208,3 +208,5 @@ 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
+      - install -D packaging/linux/flatpak/install-mouse /app/bin/install-mouse
+

From 86db3d510e25e422cc43a09004858f813a40f658 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Wed, 2 Nov 2022 07:26:04 -0400
Subject: [PATCH 02/35] Add files via upload

---
 packaging/linux/flatpak/install-mouse | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 packaging/linux/flatpak/install-mouse

diff --git a/packaging/linux/flatpak/install-mouse b/packaging/linux/flatpak/install-mouse
new file mode 100644
index 00000000000..adc08becda1
--- /dev/null
+++ b/packaging/linux/flatpak/install-mouse
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+cp /app/share/sunshine/udev/rules.d/85-sunshine.rules $HOME/.config/sunshine
+flatpak-spawn --host pkexec sh -c "sudo usermod -a -G input $USER && cp $HOME/.config/sunshine/85-sunshine.rules /etc/udev/rules.d"
+rm $HOME/.config/sunshine/85-sunshine.rules
+echo Restart computer for mouse permission to take effect.

From 07e281393d4a4c4ec8bea8b54d9ad165df90b2ed Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Wed, 2 Nov 2022 07:32:02 -0400
Subject: [PATCH 03/35] Add files via upload

---
 packaging/linux/flatpak/remove-mouse | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 packaging/linux/flatpak/remove-mouse

diff --git a/packaging/linux/flatpak/remove-mouse b/packaging/linux/flatpak/remove-mouse
new file mode 100644
index 00000000000..1f8f8b61587
--- /dev/null
+++ b/packaging/linux/flatpak/remove-mouse
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+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.

From b13c78563057c1cccba1dfd0e1d4d0d06be60cd7 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Wed, 2 Nov 2022 07:32:56 -0400
Subject: [PATCH 04/35] Update dev.lizardbyte.sunshine.yml

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index c74023c8e50..907dfd01aa7 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -209,4 +209,5 @@ modules:
         's/("((do)|(undo)|(cmd)|(detached))"\s*:\s*\[?\n*\s*")(.*")/\1flatpak-spawn --host \7/gm'
         /app/share/sunshine/apps.json
       - install -D packaging/linux/flatpak/install-mouse /app/bin/install-mouse
+      - install -D packaging/linux/flatpak/remove-mouse /app/bin/remove-mouse
 

From e9992491f371625e31a2966cd979ff9e7098c6fb Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 06:37:56 -0400
Subject: [PATCH 05/35] Update dev.lizardbyte.sunshine.yml

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index 907dfd01aa7..6fc986bb73c 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -208,6 +208,8 @@ 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
+      - pwd
+      - ls .
       - install -D packaging/linux/flatpak/install-mouse /app/bin/install-mouse
       - install -D packaging/linux/flatpak/remove-mouse /app/bin/remove-mouse
 

From ed53bcc7dd7dfa49bc645170a5cee4006c201e94 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 06:38:55 -0400
Subject: [PATCH 06/35] Rename install-mouse to install-mouse.sh

---
 packaging/linux/flatpak/{install-mouse => install-mouse.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packaging/linux/flatpak/{install-mouse => install-mouse.sh} (100%)

diff --git a/packaging/linux/flatpak/install-mouse b/packaging/linux/flatpak/install-mouse.sh
similarity index 100%
rename from packaging/linux/flatpak/install-mouse
rename to packaging/linux/flatpak/install-mouse.sh

From 3bd54f1483dbddc4b4afe9a916f23e863b583a09 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 06:39:10 -0400
Subject: [PATCH 07/35] Rename remove-mouse to remove-mouse.sh

---
 packaging/linux/flatpak/{remove-mouse => remove-mouse.sh} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename packaging/linux/flatpak/{remove-mouse => remove-mouse.sh} (100%)

diff --git a/packaging/linux/flatpak/remove-mouse b/packaging/linux/flatpak/remove-mouse.sh
similarity index 100%
rename from packaging/linux/flatpak/remove-mouse
rename to packaging/linux/flatpak/remove-mouse.sh

From e3983889a82f6cd82d8dba3beb1203ee41a936f2 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 06:39:43 -0400
Subject: [PATCH 08/35] Update dev.lizardbyte.sunshine.yml

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index 6fc986bb73c..5af3a840be2 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -210,6 +210,6 @@ modules:
         /app/share/sunshine/apps.json
       - pwd
       - ls .
-      - install -D packaging/linux/flatpak/install-mouse /app/bin/install-mouse
-      - install -D packaging/linux/flatpak/remove-mouse /app/bin/remove-mouse
+      - install -D packaging/linux/flatpak/install-mouse.sh /app/bin/install-mouse
+      - install -D packaging/linux/flatpak/remove-mouse.sh /app/bin/remove-mouse
 

From 70a8b6954d02fdbca5a8b789b4deb13d3c495437 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 07:01:02 -0400
Subject: [PATCH 09/35] Update install-mouse.sh

---
 packaging/linux/flatpak/install-mouse.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packaging/linux/flatpak/install-mouse.sh b/packaging/linux/flatpak/install-mouse.sh
index adc08becda1..facac9fc6bb 100644
--- a/packaging/linux/flatpak/install-mouse.sh
+++ b/packaging/linux/flatpak/install-mouse.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 
-cp /app/share/sunshine/udev/rules.d/85-sunshine.rules $HOME/.config/sunshine
-flatpak-spawn --host pkexec sh -c "sudo usermod -a -G input $USER && cp $HOME/.config/sunshine/85-sunshine.rules /etc/udev/rules.d"
-rm $HOME/.config/sunshine/85-sunshine.rules
+UDEV=$(cat /app/share/sunshine/udev/rules.d/85-sunshine.rules)
+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.

From 4aefb3f5d8feb24c75c03fccb61c0320e05ce6d4 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 07:08:44 -0400
Subject: [PATCH 10/35] Add files via upload

---
 packaging/linux/flatpak/scripts/install-mouse.sh | 5 +++++
 packaging/linux/flatpak/scripts/remove-mouse.sh  | 4 ++++
 2 files changed, 9 insertions(+)
 create mode 100644 packaging/linux/flatpak/scripts/install-mouse.sh
 create mode 100644 packaging/linux/flatpak/scripts/remove-mouse.sh

diff --git a/packaging/linux/flatpak/scripts/install-mouse.sh b/packaging/linux/flatpak/scripts/install-mouse.sh
new file mode 100644
index 00000000000..facac9fc6bb
--- /dev/null
+++ b/packaging/linux/flatpak/scripts/install-mouse.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+UDEV=$(cat /app/share/sunshine/udev/rules.d/85-sunshine.rules)
+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.
diff --git a/packaging/linux/flatpak/scripts/remove-mouse.sh b/packaging/linux/flatpak/scripts/remove-mouse.sh
new file mode 100644
index 00000000000..1f8f8b61587
--- /dev/null
+++ b/packaging/linux/flatpak/scripts/remove-mouse.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+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.

From 34104504a4bec8b81e4fc44c96453d2a7f088818 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 07:09:03 -0400
Subject: [PATCH 11/35] Delete install-mouse.sh

---
 packaging/linux/flatpak/install-mouse.sh | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 packaging/linux/flatpak/install-mouse.sh

diff --git a/packaging/linux/flatpak/install-mouse.sh b/packaging/linux/flatpak/install-mouse.sh
deleted file mode 100644
index facac9fc6bb..00000000000
--- a/packaging/linux/flatpak/install-mouse.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-UDEV=$(cat /app/share/sunshine/udev/rules.d/85-sunshine.rules)
-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.

From 2338cd99c6118718fddbfd65497bc84061bae14e Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 07:09:09 -0400
Subject: [PATCH 12/35] Delete remove-mouse.sh

---
 packaging/linux/flatpak/remove-mouse.sh | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 packaging/linux/flatpak/remove-mouse.sh

diff --git a/packaging/linux/flatpak/remove-mouse.sh b/packaging/linux/flatpak/remove-mouse.sh
deleted file mode 100644
index 1f8f8b61587..00000000000
--- a/packaging/linux/flatpak/remove-mouse.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-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.

From f322579579fd9e98ab6df7920e742c29a43ed417 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 07:10:02 -0400
Subject: [PATCH 13/35] Update dev.lizardbyte.sunshine.yml

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index 5af3a840be2..f116e9e0599 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -210,6 +210,4 @@ modules:
         /app/share/sunshine/apps.json
       - pwd
       - ls .
-      - install -D packaging/linux/flatpak/install-mouse.sh /app/bin/install-mouse
-      - install -D packaging/linux/flatpak/remove-mouse.sh /app/bin/remove-mouse
-
+      - install -D packaging/linux/flatpak/scripts/* /app/bin

From b0e59546f162019f4224807105ae1a60fe49f22f Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 07:13:10 -0400
Subject: [PATCH 14/35] Update dev.lizardbyte.sunshine.yml

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index f116e9e0599..019d6b94779 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -210,4 +210,5 @@ modules:
         /app/share/sunshine/apps.json
       - pwd
       - ls .
+      - ls $FLATPAK_BUILDER_BUILDDIR
       - install -D packaging/linux/flatpak/scripts/* /app/bin

From 303df90771206435353aafa9b25045703f2454f6 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 07:33:53 -0400
Subject: [PATCH 15/35] Update dev.lizardbyte.sunshine.yml

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index 019d6b94779..cfa04df09df 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -209,6 +209,7 @@ modules:
         's/("((do)|(undo)|(cmd)|(detached))"\s*:\s*\[?\n*\s*")(.*")/\1flatpak-spawn --host \7/gm'
         /app/share/sunshine/apps.json
       - pwd
+      - printenv
       - ls .
       - ls $FLATPAK_BUILDER_BUILDDIR
       - install -D packaging/linux/flatpak/scripts/* /app/bin

From ae09bd7b4a5b26cb6785945bdffbbb542dd8d4ba Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 17:26:49 -0400
Subject: [PATCH 16/35] Update dev.lizardbyte.sunshine.yml

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index cfa04df09df..da7e7da2be7 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -208,8 +208,4 @@ 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
-      - pwd
-      - printenv
-      - ls .
-      - ls $FLATPAK_BUILDER_BUILDDIR
-      - install -D packaging/linux/flatpak/scripts/* /app/bin
+      - install -D $FLATPAK_BUILDER_BUILDDIR/packaging/linux/flatpak/scripts/* /app/bin

From f2800a357c7bd190dc38c06aff7be067f72d0e4d Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Thu, 3 Nov 2022 17:47:06 -0400
Subject: [PATCH 17/35] Add files via upload

---
 packaging/linux/flatpak/scripts/install-user-service.sh | 7 +++++++
 packaging/linux/flatpak/scripts/remove-user-service.sh  | 6 ++++++
 2 files changed, 13 insertions(+)
 create mode 100644 packaging/linux/flatpak/scripts/install-user-service.sh
 create mode 100644 packaging/linux/flatpak/scripts/remove-user-service.sh

diff --git a/packaging/linux/flatpak/scripts/install-user-service.sh b/packaging/linux/flatpak/scripts/install-user-service.sh
new file mode 100644
index 00000000000..167a73f3e6f
--- /dev/null
+++ b/packaging/linux/flatpak/scripts/install-user-service.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+mkdir -p ~/.config/systemd
+mkdir -p ~/.config/systemd/user
+cp /app/share/sunshine/systemd/user/sunshine.service $HOME/.config/systemd/user/sunshine.service
+sed -i 's/\/app\/bin\/sunshine/flatpak run dev.lizardbyte.sunshine\nExecStop=flatpak kill dev.lizardbyte.sunshine/g' $HOME/.config/systemd/user/sunshine.service
+echo Sunshine User Service has been installed.
diff --git a/packaging/linux/flatpak/scripts/remove-user-service.sh b/packaging/linux/flatpak/scripts/remove-user-service.sh
new file mode 100644
index 00000000000..9a8e504f30c
--- /dev/null
+++ b/packaging/linux/flatpak/scripts/remove-user-service.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+systemctl --user stop sunshine
+rm $HOME/.config/systemd/user/sunshine.service
+systemctl --user daemon-reload
+echo Sunshine User Service has been uninstalled.

From 0a98b54c5a4a5e17cde838c3eded5ac02b673b27 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Fri, 4 Nov 2022 19:26:04 -0400
Subject: [PATCH 18/35] Update dev.lizardbyte.sunshine.yml

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index da7e7da2be7..48782ad2c2b 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -208,4 +208,6 @@ 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

From d222c461abcb920fbbfa82a3c707342b9128591e Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Fri, 4 Nov 2022 19:26:48 -0400
Subject: [PATCH 19/35] Update install-user-service.sh

---
 packaging/linux/flatpak/scripts/install-user-service.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packaging/linux/flatpak/scripts/install-user-service.sh b/packaging/linux/flatpak/scripts/install-user-service.sh
index 167a73f3e6f..721f4dd8c80 100644
--- a/packaging/linux/flatpak/scripts/install-user-service.sh
+++ b/packaging/linux/flatpak/scripts/install-user-service.sh
@@ -3,5 +3,4 @@
 mkdir -p ~/.config/systemd
 mkdir -p ~/.config/systemd/user
 cp /app/share/sunshine/systemd/user/sunshine.service $HOME/.config/systemd/user/sunshine.service
-sed -i 's/\/app\/bin\/sunshine/flatpak run dev.lizardbyte.sunshine\nExecStop=flatpak kill dev.lizardbyte.sunshine/g' $HOME/.config/systemd/user/sunshine.service
 echo Sunshine User Service has been installed.

From 64d4cc026e4d9d937f6b8c01876da3250e5df893 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Fri, 4 Nov 2022 20:21:13 -0400
Subject: [PATCH 20/35] Update dev.lizardbyte.sunshine.yml

---
 packaging/linux/flatpak/dev.lizardbyte.sunshine.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
index 48782ad2c2b..675fde24139 100644
--- a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
+++ b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -208,6 +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'
+      - 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

From 0930751c8bce8cae8fb0beb2c78ceb097e37ecb2 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 5 Nov 2022 06:50:08 -0400
Subject: [PATCH 21/35] Update install-user-service.sh

---
 packaging/linux/flatpak/scripts/install-user-service.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packaging/linux/flatpak/scripts/install-user-service.sh b/packaging/linux/flatpak/scripts/install-user-service.sh
index 721f4dd8c80..2467cfe39d2 100644
--- a/packaging/linux/flatpak/scripts/install-user-service.sh
+++ b/packaging/linux/flatpak/scripts/install-user-service.sh
@@ -4,3 +4,5 @@ mkdir -p ~/.config/systemd
 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 start sunshine] to start the Sunshine service.
+echo Use [systemctl --user enable sunshine] to autostart the service on login.

From 3d92884ad113861dd99c40a8687bcbaa18958925 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 5 Nov 2022 09:39:56 -0400
Subject: [PATCH 22/35] Add files via upload

---
 .../linux/flatpak/scripts/additional-install.sh    | 14 ++++++++++++++
 .../flatpak/scripts/remove-additional-install.sh   | 11 +++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 packaging/linux/flatpak/scripts/additional-install.sh
 create mode 100644 packaging/linux/flatpak/scripts/remove-additional-install.sh

diff --git a/packaging/linux/flatpak/scripts/additional-install.sh b/packaging/linux/flatpak/scripts/additional-install.sh
new file mode 100644
index 00000000000..73f7764c2f0
--- /dev/null
+++ b/packaging/linux/flatpak/scripts/additional-install.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+# User Service
+mkdir -p ~/.config/systemd
+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.
diff --git a/packaging/linux/flatpak/scripts/remove-additional-install.sh b/packaging/linux/flatpak/scripts/remove-additional-install.sh
new file mode 100644
index 00000000000..74cb95054ed
--- /dev/null
+++ b/packaging/linux/flatpak/scripts/remove-additional-install.sh
@@ -0,0 +1,11 @@
+#!/bin/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.

From 57939c3c202ad467a8b7cb11a8162fce6098f45c Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 5 Nov 2022 09:40:40 -0400
Subject: [PATCH 23/35] Delete install-mouse.sh

---
 packaging/linux/flatpak/scripts/install-mouse.sh | 5 -----
 1 file changed, 5 deletions(-)
 delete mode 100644 packaging/linux/flatpak/scripts/install-mouse.sh

diff --git a/packaging/linux/flatpak/scripts/install-mouse.sh b/packaging/linux/flatpak/scripts/install-mouse.sh
deleted file mode 100644
index facac9fc6bb..00000000000
--- a/packaging/linux/flatpak/scripts/install-mouse.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-UDEV=$(cat /app/share/sunshine/udev/rules.d/85-sunshine.rules)
-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.

From 94e2abcef03fc47582b9599f076281adc659c7ba Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 5 Nov 2022 09:40:48 -0400
Subject: [PATCH 24/35] Delete install-user-service.sh

---
 packaging/linux/flatpak/scripts/install-user-service.sh | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 packaging/linux/flatpak/scripts/install-user-service.sh

diff --git a/packaging/linux/flatpak/scripts/install-user-service.sh b/packaging/linux/flatpak/scripts/install-user-service.sh
deleted file mode 100644
index 2467cfe39d2..00000000000
--- a/packaging/linux/flatpak/scripts/install-user-service.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-mkdir -p ~/.config/systemd
-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 start sunshine] to start the Sunshine service.
-echo Use [systemctl --user enable sunshine] to autostart the service on login.

From 6afc2419e903dc0322ccf7272919798b3e60a737 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 5 Nov 2022 09:40:55 -0400
Subject: [PATCH 25/35] Delete remove-mouse.sh

---
 packaging/linux/flatpak/scripts/remove-mouse.sh | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 packaging/linux/flatpak/scripts/remove-mouse.sh

diff --git a/packaging/linux/flatpak/scripts/remove-mouse.sh b/packaging/linux/flatpak/scripts/remove-mouse.sh
deleted file mode 100644
index 1f8f8b61587..00000000000
--- a/packaging/linux/flatpak/scripts/remove-mouse.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-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.

From 5b338924d03911640a669bb449279f8fdab708e3 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 5 Nov 2022 09:41:00 -0400
Subject: [PATCH 26/35] Delete remove-user-service.sh

---
 packaging/linux/flatpak/scripts/remove-user-service.sh | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 packaging/linux/flatpak/scripts/remove-user-service.sh

diff --git a/packaging/linux/flatpak/scripts/remove-user-service.sh b/packaging/linux/flatpak/scripts/remove-user-service.sh
deleted file mode 100644
index 9a8e504f30c..00000000000
--- a/packaging/linux/flatpak/scripts/remove-user-service.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-systemctl --user stop sunshine
-rm $HOME/.config/systemd/user/sunshine.service
-systemctl --user daemon-reload
-echo Sunshine User Service has been uninstalled.

From a74c64d7ed031226c54ef9d88f63225ecdd519d2 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 5 Nov 2022 13:16:47 -0400
Subject: [PATCH 27/35] Update additional-install.sh

---
 packaging/linux/flatpak/scripts/additional-install.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packaging/linux/flatpak/scripts/additional-install.sh b/packaging/linux/flatpak/scripts/additional-install.sh
index 73f7764c2f0..43615144494 100644
--- a/packaging/linux/flatpak/scripts/additional-install.sh
+++ b/packaging/linux/flatpak/scripts/additional-install.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 # User Service
-mkdir -p ~/.config/systemd
 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.

From 8005d63f06b01f8295ba36b7557999d5d3e18422 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 5 Nov 2022 13:26:00 -0400
Subject: [PATCH 28/35] Update installation.rst

---
 docs/source/about/installation.rst | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/source/about/installation.rst b/docs/source/about/installation.rst
index 9f65ba59d3a..a22c5a00fc6 100644
--- a/docs/source/about/installation.rst
+++ b/docs/source/about/installation.rst
@@ -116,6 +116,11 @@ Flatpak Package
 
          flatpak install --user sunshine.flatpak
 
+   Additional installation
+      .. code-block:: bash
+
+         flatpak run --command=additional-install.sh dev.lizardbyte.sunshine
+
 Start:
    X11 and NVFBC capture (X11 Only)
       .. code-block:: bash
@@ -130,7 +135,7 @@ Start:
 Uninstall:
    .. code-block:: bash
 
-      flatpak uninstall --delete-data sunshine.flatpak
+      flatpak uninstall --delete-data dev.lizardbyte.sunshine
 
 RPM Package
 ^^^^^^^^^^^

From ed51c99168a844ecba80967379e880da01b6d1db Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 5 Nov 2022 14:23:13 -0400
Subject: [PATCH 29/35] Update installation.rst

---
 docs/source/about/installation.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/source/about/installation.rst b/docs/source/about/installation.rst
index a22c5a00fc6..62e4ef73c75 100644
--- a/docs/source/about/installation.rst
+++ b/docs/source/about/installation.rst
@@ -116,7 +116,7 @@ Flatpak Package
 
          flatpak install --user sunshine.flatpak
 
-   Additional installation
+   Additional installation (required)
       .. code-block:: bash
 
          flatpak run --command=additional-install.sh dev.lizardbyte.sunshine
@@ -135,6 +135,7 @@ Start:
 Uninstall:
    .. code-block:: bash
 
+      flatpak run --command=remove-additional-install.sh dev.lizardbyte.sunshine
       flatpak uninstall --delete-data dev.lizardbyte.sunshine
 
 RPM Package

From 002d89f7d97170f830b85a53f43b630cfba342fe Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Sat, 5 Nov 2022 14:36:42 -0400
Subject: [PATCH 30/35] Update installation.rst

---
 docs/source/about/installation.rst | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/docs/source/about/installation.rst b/docs/source/about/installation.rst
index 62e4ef73c75..a18cd5cddd2 100644
--- a/docs/source/about/installation.rst
+++ b/docs/source/about/installation.rst
@@ -123,10 +123,18 @@ Flatpak Package
 
 Start:
    X11 and NVFBC capture (X11 Only)
+      Direct start
+
       .. code-block:: bash
 
          flatpak run dev.lizardbyte.sunshine
 
+      Sunshine Service
+
+      .. code-block:: bash
+
+         systemctl --user start sunshine
+
    KMS capture (Wayland & X11)
       .. code-block:: bash
 

From 3c7657dd08ffb6ea7588b84025b3ea85efe0441e Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Tue, 8 Nov 2022 07:36:50 -0400
Subject: [PATCH 31/35] Update installation.rst

---
 docs/source/about/installation.rst | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/docs/source/about/installation.rst b/docs/source/about/installation.rst
index a18cd5cddd2..c9f3e882a29 100644
--- a/docs/source/about/installation.rst
+++ b/docs/source/about/installation.rst
@@ -104,17 +104,17 @@ 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_x86_64.flatpak`` and run the following code.
 
    System level (recommended)
       .. code-block:: bash
 
-         flatpak install --system sunshine.flatpak
+         flatpak install --system  ./sunshine_x86_64.flatpak 
 
    User level
       .. code-block:: bash
 
-         flatpak install --user sunshine.flatpak
+         flatpak install --user  ./sunshine_x86_64.flatpak 
 
    Additional installation (required)
       .. code-block:: bash
@@ -123,18 +123,10 @@ Flatpak Package
 
 Start:
    X11 and NVFBC capture (X11 Only)
-      Direct start
-
       .. code-block:: bash
 
          flatpak run dev.lizardbyte.sunshine
 
-      Sunshine Service
-
-      .. code-block:: bash
-
-         systemctl --user start sunshine
-
    KMS capture (Wayland & X11)
       .. code-block:: bash
 

From 2332f91b3313e831fd4a89d7ca49845bb50ae37b Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Tue, 8 Nov 2022 07:37:55 -0400
Subject: [PATCH 32/35] Update installation.rst

---
 docs/source/about/installation.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/about/installation.rst b/docs/source/about/installation.rst
index c9f3e882a29..d428a575139 100644
--- a/docs/source/about/installation.rst
+++ b/docs/source/about/installation.rst
@@ -109,12 +109,12 @@ Flatpak Package
    System level (recommended)
       .. code-block:: bash
 
-         flatpak install --system  ./sunshine_x86_64.flatpak 
+         flatpak install --system ./sunshine_x86_64.flatpak
 
    User level
       .. code-block:: bash
 
-         flatpak install --user  ./sunshine_x86_64.flatpak 
+         flatpak install --user ./sunshine_x86_64.flatpak
 
    Additional installation (required)
       .. code-block:: bash

From 6fc975f32f61687fe8ea3c7e67eedb066abe7c8d Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Tue, 8 Nov 2022 07:45:09 -0400
Subject: [PATCH 33/35] Update usage.rst

---
 docs/source/about/usage.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/source/about/usage.rst b/docs/source/about/usage.rst
index 81cfcdcda8e..1c501423e06 100644
--- a/docs/source/about/usage.rst
+++ b/docs/source/about/usage.rst
@@ -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.
 
@@ -81,6 +80,7 @@ Sunshine needs access to `uinput` to create mouse and gamepad events.
 
             [Service]
             ExecStart=<see table>
+            #ExecStop=Flatpak Only
 
             [Install]
             WantedBy=graphical-session.target
@@ -95,7 +95,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**

From 557c6dc4196b9ca0047e0216a6a93368a84544e9 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Tue, 8 Nov 2022 07:59:58 -0400
Subject: [PATCH 34/35] Update usage.rst

---
 docs/source/about/usage.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/source/about/usage.rst b/docs/source/about/usage.rst
index 1c501423e06..7d59b715122 100644
--- a/docs/source/about/usage.rst
+++ b/docs/source/about/usage.rst
@@ -80,7 +80,8 @@ Sunshine needs access to `uinput` to create mouse and gamepad events.
 
             [Service]
             ExecStart=<see table>
-            #ExecStop=Flatpak Only
+            #Flatpak Only
+            #ExecStop=flatpak kill dev.lizardbyte.sunshine
 
             [Install]
             WantedBy=graphical-session.target

From 878f991687d383cbd4fa55031f8fd1e006d386a6 Mon Sep 17 00:00:00 2001
From: istori1 <107304850+istori1@users.noreply.github.com>
Date: Tue, 8 Nov 2022 21:50:23 -0400
Subject: [PATCH 35/35] Update installation.rst

---
 docs/source/about/installation.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/source/about/installation.rst b/docs/source/about/installation.rst
index d428a575139..c661af3e919 100644
--- a/docs/source/about/installation.rst
+++ b/docs/source/about/installation.rst
@@ -104,17 +104,19 @@ Flatpak Package
    :alt: GitHub issues by-label
 
 #. Install `Flatpak <https://flatpak.org/setup/>`_ as required.
-#. Download ``sunshine_x86_64.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_x86_64.flatpak
+         flatpak install --system ./sunshine_{arch}.flatpak
 
    User level
       .. code-block:: bash
 
-         flatpak install --user ./sunshine_x86_64.flatpak
+         flatpak install --user ./sunshine_{arch}.flatpak
 
    Additional installation (required)
       .. code-block:: bash