updated to use revolution config.sample.json

2 files changed, 3 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a59d3f00beb8..b8a87f38c182 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = revolution-desktop-git
 	pkgdesc = A glossy Matrix collaboration client for the desktop.
 	pkgver = r9235.99ae606c
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.eastcoast.hosting/ponies/riot-web
 	arch = x86_64
 	license = custom:CSL
diff --git a/PKGBUILD b/PKGBUILD
index da6f279c4e2e..d4ed7f243b13 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
 pkgbase=revolution-desktop-git
 pkgver=r9235.99ae606c
-pkgrel=1
+pkgrel=2
 pkgname=(revolution-web-git revolution-desktop-git)
 pkgdesc="A glossy Matrix collaboration client for the desktop."
 arch=('x86_64')
@@ -36,18 +36,6 @@ pkgver() {
   )
 }
 
-prepare() {
-  cd riot-desktop
-  # Switch target to output to directory rather than .deb package
-  # @todo this needs to be fixed
-  sed -i 's/"target": "deb"/"target": "dir"/g' package.json
-  sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' riot.im/release/config.json
-
-  cd ../riot-web
-  # Disable auto updating
-  sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' riot.im/app/config.json
-}
-
 build() {
   cd matrix-js-sdk
   yarn install
@@ -105,7 +93,7 @@ package_revolution-desktop-git() {
 
   # Config file
   ln -s /etc/revolution/config.json "${pkgdir}"/etc/webapps/revolution/config.json
-  install -Dm644 riot.im/release/config.json -t "${pkgdir}"/etc/revolution/
+  install -Dm644 config.sample.json -t "${pkgdir}"/etc/revolution/config.json
 
   # Required extras
   install -Dm644 ../revolution-desktop.desktop "${pkgdir}"/usr/share/applications/revolution-desktop.desktop