Merge branch 'nightly' into fix/image-paths

src_assets/linux/misc/conffiles

@@ -1,2 +0,0 @@
-/usr/local/sunshine/config/sunshine.conf
-/usr/local/sunshine/config/apps.json

src_assets/linux/misc/postinst

@@ -12,27 +12,6 @@ else
         echo "Warning: /etc/group not found"
 fi
 
-if [ -f /usr/local/sunshine/config/sunshine.conf.old ]; then
-	echo "Restoring old sunshine.conf"
-	mv /usr/local/sunshine/config/sunshine.conf.old /usr/local/sunshine/config/sunshine.conf
-fi
-
-if [ -f /usr/local/sunshine/config/apps.json.old ]; then
-	echo "Restoring old apps.json"
-	mv /usr/local/sunshine/config/apps.json.old /usr/local/sunshine/config/apps.json
-fi
-
-# Update permissions on config files for Web Manager
-if [ -f /usr/local/sunshine/config/apps.json ]; then
-	echo "chmod 666 /etc/sunshine/apps.json"
-	chmod 666 /usr/local/sunshine/config/apps.json
-fi
-
-if [ -f /usr/local/sunshine/config/sunshine.conf ]; then
-	echo "chmod 666 /etc/sunshine/sunshine.conf"
-	chmod 666 /usr/local/sunshine/config/sunshine.conf
-fi
-
 # Ensure Sunshine can grab images from KMS
 path_to_setcap=$(which setcap)
 if [ -x "$path_to_setcap" ] ; then

src_assets/linux/misc/preinst

@@ -1,9 +0,0 @@
-#!/bin/sh
-#Store backup for old config files to prevent it from being overwritten
-if [ -f /usr/local/sunshine/config/sunshine.conf ]; then
-        cp /usr/local/sunshine/config/sunshine.conf /usr/local/sunshine/config/sunshine.conf.old
-fi
-
-if [ -f /usr/local/sunshine/config/apps.json ]; then
-        cp /usr/local/sunshine/config/apps.json /usr/local/sunshine/config/apps.json.old
-fi