Merge branch 'master' into kill

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ubports-installer",
-  "version": "0.4.2-beta",
+  "version": "0.4.3-beta",
   "description": "The easy way to install Ubuntu Touch on UBports devices. A friendly cross-platform Installer for Ubuntu Touch. Just connect a supported device to your PC, follow the on-screen instructions and watch this awesome tool do all the rest.",
   "keywords": [
     "Ubuntu",
@@ -59,7 +59,7 @@
     "jquery": "^3.1.1",
     "jquery-i18next": "^1.2.0",
     "mkdirp": "^0.5.1",
-    "promise-android-tools": "^1.0.6",
+    "promise-android-tools": "^1.0.7",
     "request": "^2.79.0",
     "system-image-node-module": "^1.0.10",
     "ubports-api-node-module": "^2.0.1",

snap/snapcraft.yaml

@@ -1,17 +1,18 @@
 name: ubports-installer
-version: readfromscript
-version-script: "cat package.json | grep version | sed s/'  \"version\": \"'//g | sed s/'\",'//g"
+adopt-info: ubports-installer
 summary: The easy way to install Ubuntu Touch on UBports devices.
 description: A friendly cross-platform Installer for Ubuntu Touch. Just connect a supported device to your PC, follow the on-screen instructions and watch this awesome tool do all the rest.
 icon: build/icons/icon.png
 architectures: [amd64]
+license: GPL-3.0
 
 grade: stable
 confinement: strict
+base: core18
 
 apps:
   ubports-installer:
-    command: desktop-launch $SNAP/bin/snap-wrapper
+    command: ./app/ubports-installer
     plugs:
       - home
       - unity7
@@ -21,14 +22,24 @@ apps:
       - pulseaudio
       - opengl
       - adb-support
+      - raw-usb
       - desktop
       - desktop-legacy
       - wayland
+    environment:
+      "FONTCONFIG_PATH": "$SNAP/etc/fonts"
+      "FONTCONFIG_FILE": "$SNAP/etc/fonts/fonts.conf"
+      "XDG_DATA_HOME": "$SNAP/usr/share"
+      "LD_LIBRARY_PATH": "$SNAP_LIBRARY_PATH:$SNAP/usr/lib/x86_64-linux-gnu/"
 
 parts:
   ubports-installer:
-    plugin: nodejs
-    node-engine: 8.10.0
+    plugin: dump
+    source: .
+    build-packages:
+      - npm
+      - nodejs
+      - libgconf-2-4
     stage-packages:
       - libnotify4
       - libappindicator1
@@ -39,13 +50,16 @@ parts:
       - gconf2
       - libasound2
       - pulseaudio
-    after:
-      - desktop-glib-only
+    override-pull: |
+      snapcraftctl pull
+      snapcraftctl set-version `cat package.json | grep version | sed s/'  \"version\": \"'//g | sed s/'\",'//g`
     override-build: |
+      echo "Running override-build script"
+      npm install
       ./build.js -o 'linux' -p 'dir'
-      mkdir $SNAPCRAFT_PART_INSTALL/app
+      mkdir -p $SNAPCRAFT_PART_INSTALL/app
+      rm -rf $SNAPCRAFT_PART_INSTALL/app/*
       mv dist/linux-unpacked/* $SNAPCRAFT_PART_INSTALL/app
-      mv bin/* $SNAPCRAFT_PART_INSTALL/bin
     prime:
       - -node_modules
       - -lib/node_modules