LBRYCommunity/buildozer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Expand "~" user before every path normalization.

Browse source
This commit is contained in:
Pascal Chambon 2020-06-24 21:24:45 +02:00
parent a967c0912e
commit 1323c057e1
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
buildozer/__init__.py
View file

@ -685,7 +685,7 @@ class Buildozer:
def _copy_application_sources(self):
# XXX clean the inclusion/exclusion algo.
source_dir = realpath(self.config.getdefault('app', 'source.dir', '.'))
source_dir = realpath(expanduser(self.config.getdefault('app', 'source.dir', '.')))
include_exts = self.config.getlist('app', 'source.include_exts', '')
exclude_exts = self.config.getlist('app', 'source.exclude_exts', '')
exclude_dirs = self.config.getlist('app', 'source.exclude_dirs', '')
@ -807,7 +807,7 @@ class Buildozer:
@property
def root_dir(self):
return realpath(dirname(self.specfilename))
return realpath(expanduser(dirname(self.specfilename)))
@property
def user_build_dir(self):
@ -821,7 +821,7 @@ class Buildozer:
build_dir = self.config.getdefault('buildozer', 'build_dir', build_dir)
if build_dir is not None:
build_dir = realpath(join(self.root_dir, build_dir))
build_dir = realpath(join(self.root_dir, expanduser(build_dir)))
return build_dir

2
buildozer/scripts/remote.py
View file

@ -173,7 +173,7 @@ class BuildozerRemote(Buildozer):
def _ssh_sync(self, directory, mode='put'):
self.debug('Syncing {} directory'.format(directory))
directory = realpath(directory)
directory = realpath(expanduser(directory))
base_strip = directory.rfind('/')
if mode == 'get':
local_dir = join(directory, 'bin')

14
buildozer/targets/android.py
View file

@ -87,7 +87,7 @@ class TargetAndroid(Target):
hook = self.buildozer.config.getdefault("app", "p4a.hook", None)
if hook is not None:
self.extra_p4a_args += ' --hook={}'.format(realpath(hook))
self.extra_p4a_args += ' --hook={}'.format(realpath(expanduser(hook)))
port = self.buildozer.config.getdefault('app', 'p4a.port', None)
if port is not None:
self.extra_p4a_args += ' --port={}'.format(port)
@ -868,16 +868,16 @@ class TargetAndroid(Target):
blacklist_src = self.buildozer.config.getdefault('app', 'android.blacklist_src', None)
if whitelist_src:
cmd.append('--whitelist')
cmd.append(realpath(whitelist_src))
cmd.append(realpath(expanduser(whitelist_src)))
if blacklist_src:
cmd.append('--blacklist')
cmd.append(realpath(blacklist_src))
cmd.append(realpath(expanduser(blacklist_src)))
# support for aars
aars = self.buildozer.config.getlist('app', 'android.add_aars', [])
for aar in aars:
cmd.append('--add-aar')
cmd.append(realpath(aar))
cmd.append(realpath(expanduser(aar)))
# support for uses-lib
uses_library = self.buildozer.config.getlist(
@ -1235,8 +1235,8 @@ class TargetAndroid(Target):
# convert our references to relative path
app_references = self.buildozer.config.getlist(
'app', 'android.library_references', [])
source_dir = realpath(self.buildozer.config.getdefault(
'app', 'source.dir', '.'))
source_dir = realpath(expanduser(self.buildozer.config.getdefault(
'app', 'source.dir', '.')))
for cref in app_references:
# get the full path of the current reference
ref = realpath(join(source_dir, cref))
@ -1246,7 +1246,7 @@ class TargetAndroid(Target):
cref))
exit(1)
# get a relative path from the project file
ref = relpath(ref, realpath(dist_dir))
ref = relpath(ref, realpath(expanduser(dist_dir)))
# ensure the reference exists
references.append(ref)