Switch from AppImage to .deb

5 files changed, 16 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89d76203ae19..325f81a13f3b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Tue Jul 25 23:01:58 UTC 2017
+# Mon Jul 31 09:05:04 UTC 2017
 pkgbase = etcher
 	pkgdesc = Burn images to SD cards & USB drives, safe & easy
 	pkgver = 1.1.1
@@ -9,34 +9,18 @@ pkgbase = etcher
 	arch = x86_64
 	license = apache
 	depends = gtk2
-	depends = dbus
-	depends = libxi
-	depends = libxcursor
-	depends = libxdamage
-	depends = libxrandr
-	depends = libxcomposite
-	depends = libxext
-	depends = libxfixes
-	depends = libxrender
 	depends = libxtst
+	depends = libxss
 	depends = gconf
-	depends = glib2
 	depends = nss
-	depends = xz
-	depends = fuse2
+	depends = alsa-lib
 	optdepends = libnotify: for notifications
 	optdepends = speech-dispatcher: for text-to-speech
 	options = !strip
-	source = etcher.in
-	source = Etcher.desktop
-	source = etcher.png
-	sha256sums = 48232d91a275df4f09249aad2b43af3e71e8436bda49c79b591e92e4f3a33922
-	sha256sums = a271329e1f3dc952ab43cc3364794e7db0e62990f3e929df3e275e39c28d3980
-	sha256sums = 6c47238675cae3c7e580a62cc836a56eb44ace1346607896f1fe16c2185f3c06
-	source_i686 = https://github.com/resin-io/etcher/releases/download/v1.1.1/etcher-1.1.1-linux-x86.zip
-	sha256sums_i686 = 80c4f664968804d85b147bccb6d5c4847d9f9b90bdcc7415801ff7a643ef89b3
-	source_x86_64 = https://github.com/resin-io/etcher/releases/download/v1.1.1/etcher-1.1.1-linux-x64.zip
-	sha256sums_x86_64 = 120782ccc3a4971bb5893738c4ac74a48566cd71212995dd1fd21cc022f85ef8
+	source_i686 = https://github.com/resin-io/etcher/releases/download/v1.1.1/etcher-electron_1.1.1_i386.deb
+	sha256sums_i686 = 643a9a0830ac6f044058eb20c95b8dec45e84f2f40af69271984a6b7689e61a3
+	source_x86_64 = https://github.com/resin-io/etcher/releases/download/v1.1.1/etcher-electron_1.1.1_amd64.deb
+	sha256sums_x86_64 = 896a3520ee67304caab9f385fd9c6acd57a3f709b4728045df59afb5a2457a4d
 
 pkgname = etcher
 
diff --git a/Etcher.desktop b/Etcher.desktop
deleted file mode 100644
index 68004f050128..000000000000
--- a/Etcher.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Name=Etcher
-Exec=/usr/bin/etcher
-Comment=Burn images to SD cards & USB drives, safe & easy
-Icon=/usr/share/etcher/etcher.png
-Type=Application
-Categories=System;Utility;Archiving;
-GenericName=Etcher
-Version=1.0
-Keywords=iso;disk;usb;dvd;
diff --git a/PKGBUILD b/PKGBUILD
index 2b52a20ceea9..a90abf647148 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,23 @@
 # Maintainer: Andrew Stubbs <andrew.stubbs@gmail.com>
 pkgname=etcher
-realver=1.1.1
-pkgver=${realver//-/_}
+_realver=1.1.1
+pkgver=${_realver//-/_}
 pkgrel=1
 pkgdesc="Burn images to SD cards & USB drives, safe & easy"
 arch=('i686' 'x86_64')
 url="http://www.etcher.io/"
 license=('apache')
-depends=('gtk2' 'dbus' 'libxi' 'libxcursor' 'libxdamage' 'libxrandr'
-	 'libxcomposite' 'libxext' 'libxfixes' 'libxrender' 'libxtst'
-	 'gconf' 'glib2' 'nss' 'xz' 'fuse2')
+depends=('gtk2' 'libxtst' 'libxss' 'gconf' 'nss' 'alsa-lib')
 optdepends=('libnotify: for notifications'
 	    'speech-dispatcher: for text-to-speech')
-source=("etcher.in"
-	"Etcher.desktop"
-	"etcher.png")
-source_i686=("https://github.com/resin-io/etcher/releases/download/v$realver/etcher-$realver-linux-x86.zip")
-source_x86_64=("https://github.com/resin-io/etcher/releases/download/v$realver/etcher-$realver-linux-x64.zip")
+source_i686=("https://github.com/resin-io/etcher/releases/download/v1.1.1/etcher-electron_${_realver}_i386.deb")
+source_x86_64=("https://github.com/resin-io/etcher/releases/download/v1.1.1/etcher-electron_${_realver}_amd64.deb")
 options=("!strip")
-sha256sums=('48232d91a275df4f09249aad2b43af3e71e8436bda49c79b591e92e4f3a33922'
-            'a271329e1f3dc952ab43cc3364794e7db0e62990f3e929df3e275e39c28d3980'
-            '6c47238675cae3c7e580a62cc836a56eb44ace1346607896f1fe16c2185f3c06')
-sha256sums_i686=('80c4f664968804d85b147bccb6d5c4847d9f9b90bdcc7415801ff7a643ef89b3')
-sha256sums_x86_64=('120782ccc3a4971bb5893738c4ac74a48566cd71212995dd1fd21cc022f85ef8')
+sha256sums_i686=('643a9a0830ac6f044058eb20c95b8dec45e84f2f40af69271984a6b7689e61a3')
+sha256sums_x86_64=('896a3520ee67304caab9f385fd9c6acd57a3f709b4728045df59afb5a2457a4d')
 
 
-appimage() {
-  a=${pkgarch/i686/i386}
-  echo "etcher-$realver-$a.AppImage"
-}
-
-build() {
-    sed "s/##AppImage##/$(appimage)/g" etcher.in > etcher
-}
-
 package() {
-    install -D "$srcdir/etcher" "$pkgdir/usr/bin/etcher"
-    install -D "$(appimage)" "$pkgdir/usr/share/etcher/$(appimage)"
-    install --mode=644 -D "$srcdir/etcher.png" "$pkgdir/usr/share/etcher/etcher.png"
-    install -D "$srcdir/Etcher.desktop" "$pkgdir/usr/share/applications/Etcher.desktop"
+    cd "$pkgdir"
+    tar xf "$srcdir/data.tar.xz"
 }
diff --git a/etcher.in b/etcher.in
deleted file mode 100644
index 915b2ffb8e27..000000000000
--- a/etcher.in
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Prevent the AppImage prompting the user to create a Desktop file
-# in ~/.local when we already have one in /usr/share.
-DESKTOPINTEGRATION=no
-export DESKTOPINTEGRATION
-
-exec /usr/share/etcher/##AppImage##
diff --git a/etcher.png b/etcher.png
deleted file mode 100644
index 1bf5138c4e2d..000000000000
--- a/etcher.png
+++ /dev/null