tMerge pull request #4149 from toxeus/master - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 064fdaca2d2c2513f4ea845c413b02cfb60a272e
DIR parent c0a42b756be0494e3b45d539f68c0f5269c858de
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 22 Mar 2018 11:40:21 +0100
Merge pull request #4149 from toxeus/master
setup.py: fix icon path for user installation
Diffstat:
M setup.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
---
DIR diff --git a/setup.py b/setup.py
t@@ -27,15 +27,17 @@ if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
opts, _ = parser.parse_known_args(sys.argv[1:])
usr_share = os.path.join(sys.prefix, "share")
+ icons_dirname = 'pixmaps'
if not os.access(opts.root_path + usr_share, os.W_OK) and \
not os.access(opts.root_path, os.W_OK):
+ icons_dirname = 'icons'
if 'XDG_DATA_HOME' in os.environ.keys():
usr_share = os.environ['XDG_DATA_HOME']
else:
usr_share = os.path.expanduser('~/.local/share')
data_files += [
(os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
- (os.path.join(usr_share, 'pixmaps/'), ['icons/electrum.png'])
+ (os.path.join(usr_share, icons_dirname), ['icons/electrum.png'])
]
setup(