Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace references to generic python with references to generic python2 #48

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cppForSwig/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ DEPSDIR ?= /usr
INCLUDE_OPTS += -Icryptopp -DUSE_CRYPTOPP -D__STDC_LIMIT_MACROS
LIBRARY_OPTS += -lpthread
SWIG_OPTS += -c++ -python -classic -threads
PYVER += `python -c 'import sys; print str(sys.version_info[0]) + "." + str(sys.version_info[1])'`
PYVER += `python2 -c 'import sys; print str(sys.version_info[0]) + "." + str(sys.version_info[1])'`


UNAME := $(shell uname)
Expand Down
2 changes: 1 addition & 1 deletion cppForSwig/testswig.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2
################################################################################
# #
# Copyright (C) 2011, Alan C. Reiner <alan.reiner@gmail.com> #
Expand Down
2 changes: 1 addition & 1 deletion dpkgfiles/armory.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Name=Armory
GenericName=Bitcoin Client
Comment=Full-featured Bitcoin wallet management application
Categories=Qt;Network;
Exec=python /usr/share/armory/ArmoryQt.py
Exec=python2 /usr/share/armory/ArmoryQt.py
Icon=armoryicon
StartupNotify=false
Terminal=false
2 changes: 1 addition & 1 deletion dpkgfiles/armoryoffline.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Name=Armory (Offline-mode)
GenericName=Bitcoin Client
Comment=Full-featured Bitcoin wallet management application
Categories=Qt;Network;
Exec=python /usr/share/armory/ArmoryQt.py --offline
Exec=python2 /usr/share/armory/ArmoryQt.py --offline
Icon=armoryicon
StartupNotify=false
Terminal=false
2 changes: 1 addition & 1 deletion dpkgfiles/armorytestnet.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Name=Armory (Testnet)
GenericName=Bitcoin Client
Comment=Full-featured Bitcoin wallet management application
Categories=Qt;Network;
Exec=python /usr/share/armory/ArmoryQt.py --testnet
Exec=python2 /usr/share/armory/ArmoryQt.py --testnet
Icon=armorytestneticon
StartupNotify=false
Terminal=false
2 changes: 1 addition & 1 deletion dpkgfiles/make_deb_package.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2

import os
import shutil
Expand Down
4 changes: 2 additions & 2 deletions dpkgfiles/postinst
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2

import os
import time
Expand Down Expand Up @@ -37,7 +37,7 @@ def createDesktopFile(name, idstr, arglist, toDir=''):
deskfile.write('GenericName=Bitcoin Client\n')
deskfile.write('Comment=Full-featured Bitcoin wallet management application\n')
deskfile.write('Categories=Qt;Network;\n')
deskfile.write('Exec=python /usr/share/armory/ArmoryQt.py')
deskfile.write('Exec=python2 /usr/share/armory/ArmoryQt.py')
for a in arglist:
deskfile.write(' --%s' % a)
if perm_app_register:
Expand Down
2 changes: 1 addition & 1 deletion dpkgfiles/postrm
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2

import os
import time
Expand Down
2 changes: 1 addition & 1 deletion extras/cli_sign_txdp.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2
import sys
sys.path.append('..')
sys.path.append('.')
Expand Down
2 changes: 1 addition & 1 deletion extras/createTestChain.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2
from pybtcengine import *
from CppBlockUtils import BlockHeader as CppBlockHeader
from CppBlockUtils import BlockHeaderRef as CppBlockHeaderRef
Expand Down
2 changes: 1 addition & 1 deletion extras/extractKeysFromWallet.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2

#
# IMPORTANT: This script extracts *EVERY KEY & ADDR* out of your wallet.dat
Expand Down
2 changes: 1 addition & 1 deletion extras/mysteryHex.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2
from os import path
import sys
from optparse import OptionParser
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#! /usr/bin/python
#! /usr/bin/python2
from distutils.core import setup
import py2exe

Expand Down