From adb57f2bf8e425d1863f689a0308431b7063aee9 Mon Sep 17 00:00:00 2001 From: Brandon Dahler Date: Wed, 27 Feb 2013 16:54:10 -0600 Subject: [PATCH] Replace references to generic python with references to generic python2 --- cppForSwig/Makefile | 2 +- cppForSwig/testswig.py | 2 +- dpkgfiles/armory.desktop | 2 +- dpkgfiles/armoryoffline.desktop | 2 +- dpkgfiles/armorytestnet.desktop | 2 +- dpkgfiles/make_deb_package.py | 2 +- dpkgfiles/postinst | 4 ++-- dpkgfiles/postrm | 2 +- extras/cli_sign_txdp.py | 2 +- extras/createTestChain.py | 2 +- extras/extractKeysFromWallet.py | 2 +- extras/mysteryHex.py | 2 +- setup.py | 2 +- 13 files changed, 14 insertions(+), 14 deletions(-) diff --git a/cppForSwig/Makefile b/cppForSwig/Makefile index 473154dae..48b8e032b 100755 --- a/cppForSwig/Makefile +++ b/cppForSwig/Makefile @@ -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) diff --git a/cppForSwig/testswig.py b/cppForSwig/testswig.py index f27161b3f..55d188b48 100755 --- a/cppForSwig/testswig.py +++ b/cppForSwig/testswig.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/python2 ################################################################################ # # # Copyright (C) 2011, Alan C. Reiner # diff --git a/dpkgfiles/armory.desktop b/dpkgfiles/armory.desktop index 947be4ad4..38af444cc 100644 --- a/dpkgfiles/armory.desktop +++ b/dpkgfiles/armory.desktop @@ -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 diff --git a/dpkgfiles/armoryoffline.desktop b/dpkgfiles/armoryoffline.desktop index 2f98cd163..777cf3b37 100644 --- a/dpkgfiles/armoryoffline.desktop +++ b/dpkgfiles/armoryoffline.desktop @@ -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 diff --git a/dpkgfiles/armorytestnet.desktop b/dpkgfiles/armorytestnet.desktop index ad14e66e0..5f52a1a0a 100644 --- a/dpkgfiles/armorytestnet.desktop +++ b/dpkgfiles/armorytestnet.desktop @@ -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 diff --git a/dpkgfiles/make_deb_package.py b/dpkgfiles/make_deb_package.py index 443d46061..9eeddde5b 100644 --- a/dpkgfiles/make_deb_package.py +++ b/dpkgfiles/make_deb_package.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/python2 import os import shutil diff --git a/dpkgfiles/postinst b/dpkgfiles/postinst index 62e76c0d8..f52c13812 100755 --- a/dpkgfiles/postinst +++ b/dpkgfiles/postinst @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/python2 import os import time @@ -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: diff --git a/dpkgfiles/postrm b/dpkgfiles/postrm index 2059d9292..f77c955c2 100755 --- a/dpkgfiles/postrm +++ b/dpkgfiles/postrm @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/python2 import os import time diff --git a/extras/cli_sign_txdp.py b/extras/cli_sign_txdp.py index b9d02cf32..582b716b5 100644 --- a/extras/cli_sign_txdp.py +++ b/extras/cli_sign_txdp.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/python2 import sys sys.path.append('..') sys.path.append('.') diff --git a/extras/createTestChain.py b/extras/createTestChain.py index b39ea1314..1f11500b4 100644 --- a/extras/createTestChain.py +++ b/extras/createTestChain.py @@ -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 diff --git a/extras/extractKeysFromWallet.py b/extras/extractKeysFromWallet.py index 328a08e7e..045162b69 100755 --- a/extras/extractKeysFromWallet.py +++ b/extras/extractKeysFromWallet.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/python2 # # IMPORTANT: This script extracts *EVERY KEY & ADDR* out of your wallet.dat diff --git a/extras/mysteryHex.py b/extras/mysteryHex.py index 2c6022a1e..9f7be770a 100644 --- a/extras/mysteryHex.py +++ b/extras/mysteryHex.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/python2 from os import path import sys from optparse import OptionParser diff --git a/setup.py b/setup.py index c9699fa84..ab0125975 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,4 @@ -#! /usr/bin/python +#! /usr/bin/python2 from distutils.core import setup import py2exe