aboutsummaryrefslogtreecommitdiff
path: root/contrib/macdeploy
diff options
context:
space:
mode:
authorCory Fields <cory-nospam-@coryfields.com>2016-06-03 16:36:26 -0400
committerJonas Schnelli <dev@jonasschnelli.ch>2016-12-23 09:48:52 +0100
commit09aefb51776ad5e4652ce5122175f889b167eef5 (patch)
treebaab9d22708e1876e73d6c06925a632401c5e50c /contrib/macdeploy
parent041331e1da23e4136fd046ed870cdcc177464176 (diff)
build: Fix 'make deploy' for OSX
Native OSX uses system tools rather than 3rd party dependencies. rsvg-convert is still required, though.
Diffstat (limited to 'contrib/macdeploy')
-rwxr-xr-xcontrib/macdeploy/macdeployqtplus4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/macdeploy/macdeployqtplus b/contrib/macdeploy/macdeployqtplus
index f8201e72c6..6d43af4219 100755
--- a/contrib/macdeploy/macdeployqtplus
+++ b/contrib/macdeploy/macdeployqtplus
@@ -791,7 +791,7 @@ if config.dmg is not None:
except subprocess.CalledProcessError as e:
sys.exit(e.returncode)
- m = re.search("/Volumes/(.+$)", output)
+ m = re.search("/Volumes/(.+$)", output.decode())
disk_root = m.group(0)
disk_name = m.group(1)
@@ -868,7 +868,7 @@ if config.dmg is not None:
print(s)
p = subprocess.Popen(['osascript', '-'], stdin=subprocess.PIPE)
- p.communicate(input=s)
+ p.communicate(input=s.encode('utf-8'))
if p.returncode:
print("Error running osascript.")