Revert "change command from python2.7 to python3"
This reverts commit 3b37faf857
.
This commit is contained in:
parent
3b37faf857
commit
416463f8b7
|
@ -16,7 +16,7 @@ echo "Creating OS X packages for Bitmessage."
|
||||||
|
|
||||||
export PYBITMESSAGEVERSION=$1
|
export PYBITMESSAGEVERSION=$1
|
||||||
|
|
||||||
cd src && python3 build_osx.py py2app
|
cd src && python2.7 build_osx.py py2app
|
||||||
|
|
||||||
if [[ $? = "0" ]]; then
|
if [[ $? = "0" ]]; then
|
||||||
hdiutil create -fs HFS+ -volname "Bitmessage" -srcfolder dist/Bitmessage.app dist/bitmessage-v$1.dmg
|
hdiutil create -fs HFS+ -volname "Bitmessage" -srcfolder dist/Bitmessage.app dist/bitmessage-v$1.dmg
|
||||||
|
|
|
@ -3,7 +3,7 @@ Description=Bitmessage Daemon
|
||||||
After=network.target auditd.service
|
After=network.target auditd.service
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
ExecStart=/usr/bin/python3 /usr/src/PyBitmessage/src/bitmessagemain.py
|
ExecStart=/usr/bin/python2 /usr/src/PyBitmessage/src/bitmessagemain.py
|
||||||
ExecReload=/bin/kill -HUP $MAINPID
|
ExecReload=/bin/kill -HUP $MAINPID
|
||||||
KillMode=process
|
KillMode=process
|
||||||
Restart=on-failure
|
Restart=on-failure
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python3
|
#!/usr/bin/python2.7
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
# pylint: disable=too-many-lines,global-statement,too-many-branches,too-many-statements,inconsistent-return-statements
|
# pylint: disable=too-many-lines,global-statement,too-many-branches,too-many-statements,inconsistent-return-statements
|
||||||
# pylint: disable=too-many-nested-blocks,too-many-locals,protected-access,too-many-arguments,too-many-function-args
|
# pylint: disable=too-many-nested-blocks,too-many-locals,protected-access,too-many-arguments,too-many-function-args
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#!/usr/bin/env python2.7
|
||||||
from PyQt6 import QtGui, QtWidgets
|
from PyQt6 import QtGui, QtWidgets
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
#!/usr/bin/python2.7
|
||||||
"""
|
"""
|
||||||
src/settingsmixin.py
|
src/settingsmixin.py
|
||||||
====================
|
====================
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
"""Building osx."""
|
"""Building osx."""
|
||||||
import os
|
import os
|
||||||
from glob import glob
|
from glob import glob
|
||||||
from PyQt6 import QtCore
|
from PyQt4 import QtCore
|
||||||
from setuptools import setup
|
from setuptools import setup
|
||||||
|
|
||||||
name = "Bitmessage"
|
name = "Bitmessage"
|
||||||
|
@ -32,7 +32,7 @@ setup(
|
||||||
setup_requires=["py2app"],
|
setup_requires=["py2app"],
|
||||||
options=dict(
|
options=dict(
|
||||||
py2app=dict(
|
py2app=dict(
|
||||||
includes=['sip', 'PyQt6._qt'],
|
includes=['sip', 'PyQt4._qt'],
|
||||||
iconfile="images/bitmessage.icns"
|
iconfile="images/bitmessage.icns"
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
#!/usr/bin/python3
|
#!/usr/bin/python2.7
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import pkg_resources
|
import pkg_resources
|
||||||
|
|
Reference in New Issue
Block a user