Bumping pkgver

3 files changed, 40 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bd3c4396643..3ee93cd12c53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sun Oct  2 04:43:32 UTC 2016
+# Tue Oct 11 17:35:50 UTC 2016
 pkgbase = atom-editor-arch
 	pkgdesc = Hackable text editor for the 21st Century, built using web technologies, with some extra packages for Arch Linux package development pre-installed.
-	pkgver = 1.10.2.aa1.6.2.db0.8.9.fu0.12.0.la0.9.1.lg0.92.2.li1.18.3.ll0.5.1.lp1.0.0.lu0.38.1.t2.4.2
+	pkgver = 1.11.0.aa1.6.2.db0.8.9.fu0.12.0.la0.9.2.lg0.92.2.li1.18.3.ll0.5.1.lp1.0.0.lu0.38.2.t2.4.2
 	pkgrel = 1
 	url = https://fusion809.github.io/atom-editor-arch/
 	install = atom-arch.install
@@ -26,7 +26,7 @@ pkgbase = atom-editor-arch
 	optdepends = gvfs: file deletion support
 	conflicts = atom-editor-bin
 	conflicts = atom-editor-beta
-	source = atom-1.10.2.tar.gz::https://github.com/atom/atom/archive/v1.10.2.tar.gz
+	source = atom-1.11.0.tar.gz::https://github.com/atom/atom/archive/v1.11.0.tar.gz
 	source = about-arch::git+https://github.com/fusion809/about
 	source = dark-bint-syntax::git+https://github.com/Murriouz/dark-bint-syntax
 	source = fusion-ui::git+https://github.com/fusion809/fusion-ui
@@ -42,7 +42,7 @@ pkgbase = atom-editor-arch
 	source = atom.desktop
 	source = theme.patch
 	source = about-arch.patch
-	md5sums = ea511e7a2f8c9fac6bc2062e52435cd9
+	md5sums = a43f37b84237b174783ce4cd5b78c8ee
 	md5sums = SKIP
 	md5sums = SKIP
 	md5sums = SKIP
@@ -56,7 +56,7 @@ pkgbase = atom-editor-arch
 	md5sums = SKIP
 	md5sums = 74cc026d4104072dadb2733745f1b268
 	md5sums = 367f71ad1cfc2e03e97a48d2e32995fb
-	md5sums = 23a0d25e1759dc5bd0e6f7101fd8ea70
+	md5sums = df5504a024e1aadb9e4147a510d34e6c
 	md5sums = ae16bb627ec10bde20c7093d4be18131
 
 pkgname = atom-editor-arch
diff --git a/PKGBUILD b/PKGBUILD
index f22ba6d88962..ac8bb6181af3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,12 +4,9 @@ _version=arch
 _fusurl="https://github.com/fusion809"
 _language_patch2_url="${_fusurl}/language-patch2"
 
-# Module Versions
-_electron_ver=0.36.12
-
 pkgname=${_pkgname}-editor-${_version}
-_atomver=1.10.2
-pkgver=1.10.2.aa1.6.2.db0.8.9.fu0.12.0.la0.9.1.lg0.92.2.li1.18.3.ll0.5.1.lp1.0.0.lu0.38.1.t2.4.2
+_atomver=1.11.0
+pkgver=1.11.0.aa1.6.2.db0.8.9.fu0.12.0.la0.9.2.lg0.92.2.li1.18.3.ll0.5.1.lp1.0.0.lu0.38.2.t2.4.2
 pkgrel=1
 pkgdesc="Hackable text editor for the 21st Century, built using web technologies, with some extra packages for Arch Linux package development pre-installed."
 arch=('x86_64' 'i686')
@@ -37,7 +34,7 @@ source=("${_pkgname}-${_atomver}.tar.gz::${_url}/atom/archive/v${_atomver}.tar.g
 "atom.desktop"
 "theme.patch"
 "about-arch.patch")
-md5sums=('ea511e7a2f8c9fac6bc2062e52435cd9'
+md5sums=('a43f37b84237b174783ce4cd5b78c8ee'
          'SKIP'
          'SKIP'
          'SKIP'
@@ -51,7 +48,7 @@ md5sums=('ea511e7a2f8c9fac6bc2062e52435cd9'
          'SKIP'
          '74cc026d4104072dadb2733745f1b268'
          '367f71ad1cfc2e03e97a48d2e32995fb'
-         '23a0d25e1759dc5bd0e6f7101fd8ea70'
+         'df5504a024e1aadb9e4147a510d34e6c'
          'ae16bb627ec10bde20c7093d4be18131')
 
 pkgver() {
@@ -129,20 +126,41 @@ prepare() {
 build() {
   cd "$srcdir/${_pkgname}-${_atomver}"
   export PYTHON=/usr/bin/python2
-  until ./script/build --build-dir "$srcdir/atom-build"; do :; done
+  until ./script/build; do :; done
 }
 
 package() {
   cd "$srcdir/${_pkgname}-${_atomver}"
 
-  script/grunt install --build-dir "$srcdir/atom-build" --install-dir "$pkgdir/usr"
-
-  install -Dm755 $srcdir/${_pkgname} "$pkgdir/usr/bin/${_pkgname}"
-  install -Dm644 $srcdir/${_pkgname}.desktop "$pkgdir/usr/share/applications/${_pkgname}.desktop"
-  install -Dm644 resources/app-icons/stable/png/1024.png "$pkgdir/usr/share/pixmaps/atom.png"
-  install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE.md"
+  _ver=$(cat package.json | grep version | sed 's/version//g' | sed 's/://g' | sed 's/ //g' |  sed 's/"//g' | sed 's/,//g')
 
-  install -Dm644 $srcdir/mydict/en_AU* "${pkgdir}/usr/share/atom/resources/app.asar.unpacked/node_modules/spellchecker/vendor/hunspell_dictionaries"
-
-  find . -name "package.json" -exec sed -i -e "s|$srcdir/${_pkgname}-${_atomver}/apm|/usr/share/atom/resources/app/apm|g" '{}' +
+  _arch=amd64
+  if [ "${CARCH}" = "i686" ]; then
+  _arch=i386
+  fi
+  install -dm755 ${pkgdir}/usr/bin
+  install -dm755 ${pkgdir}/usr/share/${_pkgname}
+  install -dm755 ${pkgdir}/usr/share/applications
+  install -dm755 ${pkgdir}/usr/share/licenses/$pkgname
+  install -dm755 ${pkgdir}/usr/share/pixmaps
+
+  cp -r out/${_pkgname}-${_ver}-${_arch}/* ${pkgdir}/usr/share/${_pkgname}/
+  mv ${pkgdir}/usr/share/${_pkgname}/atom.png ${pkgdir}/usr/share/pixmaps/${_pkgname}.png
+  mv ${pkgdir}/usr/share/${_pkgname}/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+  install -Dm755 $srcdir/${_pkgname} ${pkgdir}/usr/bin/${_pkgname}
+  install -Dm644 $srcdir/${_pkgname}.desktop ${pkgdir}/usr/share/applications/${_pkgname}.desktop
+  rm ${pkgdir}/usr/share/${_pkgname}/resources/app/atom.sh
+  rm -rf ${pkgdir}/usr/share/${_pkgname}/resources/app.asar.unpacked/resources
+  ln -sf "/usr/share/${_pkgname}/resources/app/apm/node_modules/.bin/apm" "${pkgdir}/usr/bin/apm-${_version}"
+
+  find "$pkgdir" \
+    -name "*.a" -exec rm '{}' \; \
+    -or -name "*.bat" -exec rm '{}' \; \
+    -or -name "benchmark" -prune -exec rm -r '{}' \; \
+    -or -name "doc" -prune -exec rm -r '{}' \; \
+    -or -name "html" -prune -exec rm -r '{}' \; \
+    -or -name "man" -prune -exec rm -r '{}' \; \
+    -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \
+    -or -path "*/task-lists/src" -prune -exec rm -r '{}' \; \
+    -or -name "package.json" -exec sed -i -e "s|${srcdir}/atom-${_ver}/apm|/usr/share/${_pkgname}/resources/app/apm|g" '{}' +
 }
diff --git a/theme.patch b/theme.patch
index 385bab548df5..0f2c684ea229 100644
--- a/theme.patch
+++ b/theme.patch
@@ -1,30 +1,3 @@
-diff --git a/build/tasks/prebuild-less-task.coffee b/build/tasks/prebuild-less-task.coffee
-index d5b1fae..4c363aa 100644
---- a/build/tasks/prebuild-less-task.coffee
-+++ b/build/tasks/prebuild-less-task.coffee
-@@ -36,20 +36,11 @@ module.exports = (grunt) ->
-     compileBootstrap()
-
-     uiThemes = [
--      'atom-dark-ui'
--      'atom-light-ui'
--      'one-dark-ui'
--      'one-light-ui'
-+      'fusion-ui'
-     ]
-
-     syntaxThemes = [
--      'atom-dark-syntax'
--      'atom-light-syntax'
--      'one-dark-syntax'
--      'one-light-syntax'
--      'solarized-dark-syntax'
--      'base16-tomorrow-dark-theme'
--      'base16-tomorrow-light-theme'
-+      'dark-bint-syntax'
-     ]
-
-     prebuiltConfigurations = []
 diff --git a/spec/theme-manager-spec.coffee b/spec/theme-manager-spec.coffee
 index ea0ca19..bb027f3 100644
 --- a/spec/theme-manager-spec.coffee