Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bucket extraction and refactoring #3449

Merged
merged 56 commits into from
May 12, 2019
Merged

Bucket extraction and refactoring #3449

merged 56 commits into from
May 12, 2019

Conversation

r15ch13
Copy link
Member

@r15ch13 r15ch13 commented May 11, 2019

niheaven and others added 30 commits April 28, 2019 18:37
ref: ScoopInstaller/Extras#2021 (comment), #3204 (comment)

- Add new param `Overwrite` to `Expand-7ZipArchive`, with following values
  - "All": 7z param `-aoa`, overwrite All existing files without prompt, behave the same with default
  - "Skip": 7z param `-aos`, Skip extracting of existing files
  - "Rename": 7z param `-aou`, aUto rename extracting file
- Add new param `Switches` to `Expand-7ZipArchive` and `Expand-InnoArchive`
  - It could pass all unrecognized params to `7z` and `innounp`
- Patch `extract_7zip` and `unpack_inno` to adapt to `Expand-XXX`

Usage: ScoopInstaller/Extras#2021, ScoopInstaller/Extras#2070
7zip_path -> Get-7zipPath
7zip_installed -> Test-7zipInstalled
Expand-7ZipArchive -> Expand-7zipArchive
Test-7ZipRequirement -> Test-7zipRequirement
Expand-MSIArchive -> Expand-MsiArchive
Test-LessMSIRequirement -> Test-LessmsiRequirement
aria2_path > Get-Aria2Path
aria2_installed > Test-Aria2Installed
aria2_enabled > Test-Aria2Enabled
…g dependency

Prevents installing 7zip/lessmsi/innounp locally if they are already available globally
Allows un/locking a program to the current version and enable/disable updates.
Close #3232
Close #1941
- Migrate ~\.scoop to ~\.config\scoop\config.json
- Remove hashtable and hashtable_val functions because ConvertFrom-Json is enough
- Add PowerShell 6 time conversion to tests
Co-Authored-By: r15ch13 <r15ch13+git@gmail.com>
@r15ch13 r15ch13 changed the title A new aera! Bucket extraction and refactoring May 11, 2019
@r15ch13 r15ch13 marked this pull request as ready for review May 11, 2019 18:20
Copy link
Member

@chawyehsu chawyehsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small tweaks

libexec/scoop-update.ps1 Outdated Show resolved Hide resolved
libexec/scoop-update.ps1 Outdated Show resolved Hide resolved
libexec/scoop-update.ps1 Outdated Show resolved Hide resolved
test/Scoop-Core.Tests.ps1 Show resolved Hide resolved
test/Scoop-Core.Tests.ps1 Show resolved Hide resolved
- Add `Expand-DarkArchive` helper function
- Allow `dark.exe` from wixtoolset and `7zip-zstd` as valid helpers
- Add warnings to 'scoop checkup' for missing unpackers
- Auto detect dependencies from `pre_install`/`post_install` and `installer.script` by simply searching for the function names.
@r15ch13 r15ch13 merged commit 71f5044 into master May 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants