Update install files & pkgbuild

2 files changed, 3 insertions, 21 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 1d9825d5db55..02b82f4b4720 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,6 +3,7 @@
 # Contributor: Tom Bu <tom.bu AT members.fsf.org>
 # Contributor: John Reese <john@noswap.com>
 # Contributor: Jordan J Klassen <forivall@gmail.com>
+# Contributor: George Rawlinson <george@rawlinson.net.nz>
 # Upstream URL: https://github.com/atom/atom
 
 pkgname=atom-editor-bin
@@ -12,12 +13,11 @@ pkgdesc="Chrome-based text editor from Github - Precompiled binary from official
 arch=('x86_64')
 url="https://github.com/atom/atom"
 license=('MIT')
-provides=('atom')
-conflicts=('atom')
+provides=('atom' 'apm')
 options=(!strip)
 depends=('git' 'gconf' 'gtk2' 'libnotify' 'libxtst' 'nss' 'python2' 'xdg-utils' 'desktop-file-utils' 'alsa-lib' 'libgnome-keyring')
 optdepends=('gvfs')
-conflicts=('atom-editor' 'atom-editor-git' 'atom-editor-git-tagged')
+conflicts=('atom' 'atom-editor' 'atom-editor-git' 'atom-editor-git-tagged' 'apm')
 install=$pkgname.install
 
 md5sums=('e94838794c58ac46752d3183f0c19bd3'
diff --git a/atom-editor-bin.install b/atom-editor-bin.install
index 235a9dfa5f76..cbb2be3e7a23 100644
--- a/atom-editor-bin.install
+++ b/atom-editor-bin.install
@@ -1,26 +1,8 @@
 # Colored makepkg-like functions
-msg_blue() {
-  printf "${blue}==>${bold} $1${all_off}\n"
-}
-
 note() {
     printf "${blue}==>${yellow} NOTE:${bold} $1${all_off}\n"
 }
 
-_update() {
-  msg_blue "Updating desktop MIME database..."
-  update-desktop-database -q
-}
-
 post_install() {
-  _update
   note "Custom launch flags can be put in: ~/.config/atom-editor-flags.conf"
 }
-
-post_upgrade() {
-  _update
-}
-
-post_remove() {
-  _update
-}