From 027a8430ac08029613917f7cacafa0f8ed834a47 Mon Sep 17 00:00:00 2001 From: philemon Date: Thu, 17 Nov 2016 19:42:12 +0300 Subject: [PATCH] setup.py: file permissions fix for data_files/* --- data_files/mnemonic.py | 0 mmgen/globalvars.py | 2 +- mmgen/opts.py | 1 + setup.py | 9 ++++++++- 4 files changed, 10 insertions(+), 2 deletions(-) mode change 100755 => 100644 data_files/mnemonic.py diff --git a/data_files/mnemonic.py b/data_files/mnemonic.py old mode 100755 new mode 100644 diff --git a/mmgen/globalvars.py b/mmgen/globalvars.py index b2016e02..3f49b560 100755 --- a/mmgen/globalvars.py +++ b/mmgen/globalvars.py @@ -116,7 +116,7 @@ class g(object): # Global var sets user opt: global_sets_opt = ['minconf','seed_len','hash_preset','usr_randchars','debug', - 'tx_confs','tx_fee_adj','tx_fee','key_generator'] + 'tx_confs','tx_fee_adj','tx_fee','key_generator'] keyconv_exec = 'keyconv' diff --git a/mmgen/opts.py b/mmgen/opts.py index 83135156..d20b39ac 100755 --- a/mmgen/opts.py +++ b/mmgen/opts.py @@ -58,6 +58,7 @@ def die_on_incompatible_opts(incompat_list): if len(bad) > 1: die(1,'Conflicting options: %s' % ', '.join([fmt_opt(b) for b in bad])) +# TODO - delete # def _typeconvert_from_dfl(key): # # global opt diff --git a/setup.py b/setup.py index a572fe50..b094156b 100755 --- a/setup.py +++ b/setup.py @@ -18,6 +18,7 @@ from distutils.core import setup,Extension from distutils.command.build_ext import build_ext +from distutils.command.install_data import install_data import sys,os from shutil import copy2 @@ -33,6 +34,12 @@ class my_build_ext(build_ext): print 'copying %s to %s' % (ext_src,ext_dest) copy2(ext_src,ext_dest) +class my_install_data(install_data): + def run(self): + for f in 'mmgen.cfg','mnemonic.py','mn_wordlist.c': + os.chmod('data_files/'+f,0644) + install_data.run(self) + module1 = Extension( name = 'mmgen.secp256k1', sources = ['extmod/secp256k1mod.c'], @@ -53,7 +60,7 @@ setup( license = 'GNU GPL v3', platforms = 'Linux, MS Windows, Raspberry PI', keywords = 'Bitcoin, wallet, cold storage, offline storage, open-source, command-line, Python, Bitcoin Core, bitcoind, hd, deterministic, hierarchical, secure, anonymous', - cmdclass = { 'build_ext': my_build_ext }, + cmdclass = { 'build_ext': my_build_ext, 'install_data': my_install_data }, # disable building of secp256k1 extension module on Windows ext_modules = [module1] if sys.platform[:5] == 'linux' else [], data_files = [('share/mmgen', [