The Birdfont Source Code


All Repositories / birdfont.git / commit – RSS feed

Fix text encoding in install script

These changes was commited to the Birdfont repository Fri, 25 Dec 2015 10:15:48 +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, 25 Dec 2015 10:15:48 +0000 (11:15 +0100)
committer Johan Mattsson <johan.mattsson.m@gmail.com>
Fri, 25 Dec 2015 10:15:48 +0000 (11:15 +0100)
commit bb5b30f8a1d2ac0dc183d8562112e4da36e4c784
tree 25a7acc02277d49159c6e695e6794a9e7d2090e8
parent ee1c4ccfd873b6bd9077a8730e965c93d274e517
Fix text encoding in install script

birdfont/GtkWindow.vala
install.py
libbirdfont/SearchPaths.vala
--- a/birdfont/GtkWindow.vala +++ b/birdfont/GtkWindow.vala @@ -488,8 +488,8 @@ } catch (GLib.Error e) { warning (e.message); } - } - + } + public void run_non_blocking_background_thread (Task t) { unowned Thread<void*> bg;
--- a/install.py +++ b/install.py @@ -130,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() - libdir = '/lib/' + out.rstrip ('\n') + libdir = '/lib/' + out.decode('UTF-8').rstrip ('\n') else: p = platform.machine() if p == 'i386' or p == 's390' or p == 'ppc' or p == 'armv7hl':
--- a/libbirdfont/SearchPaths.vala +++ b/libbirdfont/SearchPaths.vala @@ -94,7 +94,7 @@ f = get_file (@"/usr/share/birdfont/" + d + "/", name); if (likely (f.query_exists ())) return f; - return f; + return f; } public static string get_locale_directory () {