The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

Snaps

These changes was commited to the Birdfont repository Fri, 15 Jul 2016 15:57:39 +0000.

Contributing

Send patches or pull requests to johan.mattsson.m@gmail.com.
Clone this repository: git clone https://github.com/johanmattssonm/birdfont.git
author Johan Mattsson <johan.mattsson.m@gmail.com>
Fri, 15 Jul 2016 15:57:39 +0000 (17:57 +0200)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Fri, 15 Jul 2016 18:37:42 +0000 (20:37 +0200)
commit 9427d1ea29abb8abb3add0020977dfc2642c61fc
tree 3faa3055c6dd54698754a8b4a7064468223ab0dd
parent 562fe6e9d17c25ea2bebb009f7d662c73910a1eb
Snaps

install.py
scripts/snap.sh
scripts/snapcraft.yaml
--- 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 @@ 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()
--- 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 .. && \
--- a/scripts/snapcraft.yaml +++ b/scripts/snapcraft.yaml @@ -9,16 +9,12 @@ 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,15 +22,11 @@ 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]