Snaps

Changed files (3)

• modified install.py
• modified scripts/snap.sh
• modified scripts/snapcraft.yaml

Diff

diff --git a/install.py b/install.pyindex 051c916..f48be4d 100755--- a/install.py+++ b/install.py@@ -1,6 +1,5 @@ #!/usr/bin/python3-"""-Copyright (C) 2013 2014 2015 Johan Mattsson+""" Copyright (C) 2013 2014 2015 Johan Mattsson  This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by@@ -131,7 +130,7 @@ elif not options.libdir: 	if platform.dist()[0] == 'Ubuntu' or platform.dist()[0] == 'Debian': 		process = subprocess.Popen(['dpkg-architecture', '-qDEB_HOST_MULTIARCH'], stdout=subprocess.PIPE) 		out, err = process.communicate()-		out = str(out)+		out = out.decode('ascii') 		libdir = '/lib/' + out.rstrip ('\n') 	else: 		p = platform.machine()diff --git a/scripts/snap.sh b/scripts/snap.shindex e70b611..d08a3ab 100755--- a/scripts/snap.sh+++ b/scripts/snap.sh@@ -1,17 +1,16 @@ #!/bin/sh +if ! git diff --exit-code > /dev/null; then+        echo "Uncommitted changes, commit before creating the release."+        exit 1+fi+ SOURCE_DIR="$(pwd)"  rm -rf $SOURCE_DIR/build/snapsource mkdir -p $SOURCE_DIR/build/snapsource && \-cd $SOURCE_DIR/build/snapsource--if [ -f  birdfont ] ; then-	git pull file:///$SOURCE_DIR-else-	git clone --depth=1 file:///$SOURCE_DIR birdfont-fi-+cd $SOURCE_DIR/build/snapsource && \+git clone --depth=1 file:///$SOURCE_DIR birdfont && \ cd $SOURCE_DIR/build/snapsource/birdfont && \ python3 ./scripts/complete_translations.py -t 93 -i && \ cd .. && \diff --git a/scripts/snapcraft.yaml b/scripts/snapcraft.yamlindex 25e445f..8761360 100644--- a/scripts/snapcraft.yaml+++ b/scripts/snapcraft.yaml@@ -9,16 +9,12 @@ build-packages: [valac, python3, libglib2.0-dev, libgtk-3-dev,  libxmlbird-dev, python-pkg-resources]  apps: -  birdfont: -    command: gtk-launch usr/bin/birdfont-    plugs: [home, gsettings, x11, unity7]-   run:      command: gtk-launch usr/bin/birdfont     plugs: [home, gsettings, x11, unity7] -  debug: -    command: gdb usr/bin/birdfont+  plain: +    command: birdfont     plugs: [home, gsettings, x11, unity7]  parts: @@ -26,14 +22,10 @@ parts:     plugin: make     source: snapsource/birdfont     stage-packages:-      - desktop-file-utils-      - gsettings-desktop-schemas       - libglib2.0-0       - libwebkit2gtk-3.0-25       - libgee-0.8-2       - libnotify4       - libsqlite3-0       - libxmlbird1-      - dconf-tools-      - gdb     after: [desktop/gtk3]