Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-17 12:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test with external command

Browse Source 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2019-07-28 10:58:41 +09:00
parent 414a188502
commit c2072c80c0
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -2,7 +2,7 @@ language: python
python: 3.6 python: 3.6
install: install:
- pip install wheel flake8 requests six py7zr bringbuf - pip install wheel flake8 requests six py7zr
script: script:
- flake8 aqt bin - flake8 aqt bin

9
aqt/cli.py
View File

@@ -68,7 +68,12 @@ class Cli():
mirror = args.base mirror = args.base
sevenzip = args.external sevenzip = args.external
if sevenzip is not None: if sevenzip is not None:
if not os.path.exists(sevenzip): if sevenzip == '_auto':
if platform.system() == 'Windows':
sevenzip = r'C:\Program Files\7-Zip\7z.exe'
else:
sevenzip = r'7zr'
elif not os.path.exists(sevenzip):
print('Specified unexist external command in option -E') print('Specified unexist external command in option -E')
exit(1) exit(1)
elif sys.version_info.major == 2: elif sys.version_info.major == 2:
@@ -135,7 +140,7 @@ class Cli():
install_parser.add_argument('-b', '--base', nargs='?', install_parser.add_argument('-b', '--base', nargs='?',
help="Specify mirror base url such as http://mirrors.ocf.berkeley.edu/qt/, " help="Specify mirror base url such as http://mirrors.ocf.berkeley.edu/qt/, "
"where 'online' folder exist.") "where 'online' folder exist.")
install_parser.add_argument('-E', '--external', nargs='?', install_parser.add_argument('-E', '--external', nargs='?', const='_auto',
help='Use external 7zip command instead of internal extractor.') help='Use external 7zip command instead of internal extractor.')
list_parser = subparsers.add_parser('list') list_parser = subparsers.add_parser('list')
list_parser.set_defaults(func=self.run_list) list_parser.set_defaults(func=self.run_list)

4
ci/steps.yml
View File

@@ -24,7 +24,7 @@ steps:
inputs: inputs:
scriptSource: filePath scriptSource: filePath
scriptPath: $(Build.SourcesDirectory)/bin/aqt scriptPath: $(Build.SourcesDirectory)/bin/aqt
arguments: install $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) arguments: install $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) -E
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
condition: not(variables['QT_BASE_MIRROR']) condition: not(variables['QT_BASE_MIRROR'])
displayName: Run Aqt (No Base URL Set) displayName: Run Aqt (No Base URL Set)
@@ -32,7 +32,7 @@ steps:
inputs: inputs:
scriptSource: filePath scriptSource: filePath
scriptPath: $(Build.SourcesDirectory)/bin/aqt scriptPath: $(Build.SourcesDirectory)/bin/aqt
arguments: install $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) -b $(QT_BASE_MIRROR) arguments: install $(QT_VERSION) $(HOST) $(TARGET) $(ARCH) -b $(QT_BASE_MIRROR) -E
workingDirectory: $(Build.BinariesDirectory) workingDirectory: $(Build.BinariesDirectory)
condition: variables['QT_BASE_MIRROR'] condition: variables['QT_BASE_MIRROR']
displayName: Run Aqt (Base URL Set) displayName: Run Aqt (Base URL Set)

1
requirements.txt
View File

@@ -7,4 +7,3 @@ flake8
wheel wheel
twine twine
py7zr py7zr
bringbuf