fix(decompress): use innoextract if innounp fails #4192

PorridgePi · 2020-12-02T15:57:00Z

Right now, the latest version of innounp (0.49) does not support newer versions of Inno Setup (like version 6.1.0). While the issue has already been raised on its SourceForge (here and here), an update to innounp does not seem imminent.

As a result, many applications could not be installed due to decompress error. These include ScoopInstaller/Extras#5223 ScoopInstaller/Extras#5213 and many more which I would list at the end.

I found dscharrer/innoextract. It is well supported and updated, and it works with the newer versions of Inno Setup. Thus, I edited decompress.ps1 so that if innounp fails, innoextract will be tried. I have also edited the code of depends.ps1 and core.ps1 to make innoextract dependent.

I apologise in advance if my pull request and/or commit is not up to the standard because I am somewhat inexperienced. However, I still hope this would help others who are facing this issue.

Thanks!

Known Issues:
ScoopInstaller/Extras#5223
ScoopInstaller/Extras#5213
ScoopInstaller/Extras#5218
ScoopInstaller/Extras#5136
ScoopInstaller/Extras#5127
ScoopInstaller/Extras#5186
ScoopInstaller/Extras#5225

… is unsupported by innounp 0.49

Ash258

Unacceptable to have two same dependencies for one thing. Allow it as config option.

Same as for lessmsi

Do not use tabs
Never ever use 'linux-like' commands/aliases in powershell scripts

PorridgePi · 2020-12-02T17:36:58Z

I have changed according to your suggestions.
I am only unsure of the config name. For now, I left it as innoex as the prefix instead of the original inno.

Ash258 · 2020-12-02T17:45:45Z

lib/install.ps1

@@ -582,6 +582,8 @@ function dl_urls($app, $version, $manifest, $bucket, $architecture, $dir, $use_c
        $extract_fn = $null
        if ($manifest.innosetup) {
            $extract_fn = 'Expand-InnoArchive'
+        } elseif($manifest.innoexsetup) {
+            $extract_fn = 'Expand-InnoExArchive'
        } elseif($fname -match '\.zip$') {
            # Use 7zip when available (more fast)
            if (((get_config 7ZIPEXTRACT_USE_EXTERNAL) -and (Test-CommandAvailable 7z)) -or (Test-HelperInstalled -Helper 7zip)) {


You need to use something like this:

Best possible add simple switch parameter (-UseInnoExtract or just -InnoExtract) to expand-innoarchive function

I take it back. Sorry.

Only use this in depends:

if ($manifest.innosetup) { if (get_config 'INNOSETUP_USE_INNOEXTRACT' $false) { $depends += 'innoextract' } } else { $depends += 'innounp' }

And then inside decompress, inside function Expand-InnoArchive use same logic:

if get_config ''... { $Stratus = INvoke-external Innoextract } else { $status = Invoke-External innounp }

You need to use something like this:

Thanks! I did not understand at first.

Best possible add simple switch parameter (-UseInnoExtract or just -InnoExtract) to expand-innoarchive function

Yea, that is indeed better. I shall try that out later in the day.

Hi, to add the switch parameter/option, do I edit scoop-install.ps1 and scoop-update.ps1 in scoop\libexec?

@Ash258 May I know how exactly do I add a switch parameter? Thanks.

rasa · 2020-12-03T06:16:03Z

To implement a complete solution, I searched for innounp and found we should consider also updating:

PorridgePi · 2020-12-07T09:29:58Z

Hi, may I know if there is anything else for me to improve on? Maybe other than the switch parameter @Ash258 suggested?

Ash258 · 2020-12-07T09:40:22Z

Well this will not work for most of the packages.

Since innoextract is only simple implementation it cannot be used the same way as innounp. See all manifests, which have two different architectures coming from single inno archive.

It does not support extraction the same way as innounp, which will break lots of other stuff if this is configured.

It would make sense to force it only for the relevant. So introducing new switch to the Expand-Inno function and then change all the relevant manifests should solve it.

The configuration option could stay for some experiments and for future when innoextract catch up.

So I would propose to just add new switch UseInnoextract to the function and then apply simple condition if get_config -or $UseInnoextract, then use innoextract, with message to user, that it could fail in some use cases

PorridgePi · 2020-12-12T03:07:57Z

Apologies for not responding.

Thank you so much for your guidance and explanation.

Following your instructions, I have added the new switch parameter UseInnoextract to both scoop install and scoop update, as well as an warning when the user tries to use this parameter to install and/or update an application.

lib/decompress.ps1

Ash258 · 2020-12-12T07:22:34Z

lib/install.ps1

@@ -9,7 +9,7 @@ function nightly_version($date, $quiet = $false) {
    "nightly-$date_str"
 }

-function install_app($app, $architecture, $global, $suggested, $use_cache = $true, $check_hash = $true) {
+function install_app($app, $architecture, $global, $suggested, $use_cache = $true, $check_hash = $true, $useinnoextract) {


It will be patched in manifests itself. with Expand-InnoArchive -UseInnoextract

It is nonsense to have additional switch, and 20 checks for this.

Remove

Sorry, I did not understand the part about the patch being in the manifest instead. Really sorry for the hassle caused.

The patches in the manifest should be something similar to the instaler script in this manifest, right?

lib/install.ps1

libexec/scoop-update.ps1

niheaven · 2024-05-11T16:26:20Z

Not needed.

fix(decompress): use innoextract if innounp fails as Inno Setup 6.1.0…

da5d6c4

… is unsupported by innounp 0.49

Ash258 suggested changes Dec 2, 2020

View reviewed changes

PorridgePi added 3 commits December 3, 2020 01:10

chore: Replace tabs with spaces

e9a803e

chore: Powershell cmdlet instead of unix alias

20fa5a1

fix(decompress): Change to config option

8e03fb9

Ash258 suggested changes Dec 2, 2020

View reviewed changes

PorridgePi force-pushed the master branch from 6f44544 to 8f1b529 Compare December 2, 2020 18:35

fix(compress): Re-done config option

532b53c

PorridgePi force-pushed the master branch from 8f1b529 to 532b53c Compare December 2, 2020 18:37

fix(decompress): Fixed config true false logic

2bcb0d5

fix(decompress): Complete update of innoextract

88bb050

fix(decompress): Add switch parameter with warning

cc7a71a

Ash258 suggested changes Dec 12, 2020

View reviewed changes

PorridgePi added 2 commits December 12, 2020 16:57

fix(decompress): Revert unnecessary changes to add new switch para

f2036b3

fix(decompress): Revert unnecessary changes to add new switch para

9f9ce2f

Ash258 mentioned this pull request Dec 26, 2020

Backports tracker Ash258/Scoop-Core#27

Open

21 tasks

niheaven closed this May 11, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(decompress): use innoextract if innounp fails #4192

fix(decompress): use innoextract if innounp fails #4192

PorridgePi commented Dec 2, 2020

Ash258 left a comment

PorridgePi commented Dec 2, 2020

Ash258 Dec 2, 2020

Ash258 Dec 2, 2020 •

edited

Loading

PorridgePi Dec 2, 2020 •

edited

Loading

PorridgePi Dec 3, 2020

PorridgePi Dec 5, 2020

rasa commented Dec 3, 2020

PorridgePi commented Dec 7, 2020

Ash258 commented Dec 7, 2020

PorridgePi commented Dec 12, 2020

Ash258 Dec 12, 2020 •

edited

Loading

PorridgePi Dec 12, 2020

PorridgePi Dec 12, 2020

niheaven commented May 11, 2024

fix(decompress): use innoextract if innounp fails #4192

fix(decompress): use innoextract if innounp fails #4192

Conversation

PorridgePi commented Dec 2, 2020

Ash258 left a comment

Choose a reason for hiding this comment

PorridgePi commented Dec 2, 2020

Ash258 Dec 2, 2020

Choose a reason for hiding this comment

Ash258 Dec 2, 2020 • edited Loading

Choose a reason for hiding this comment

PorridgePi Dec 2, 2020 • edited Loading

Choose a reason for hiding this comment

PorridgePi Dec 3, 2020

Choose a reason for hiding this comment

PorridgePi Dec 5, 2020

Choose a reason for hiding this comment

rasa commented Dec 3, 2020

PorridgePi commented Dec 7, 2020

Ash258 commented Dec 7, 2020

PorridgePi commented Dec 12, 2020

Ash258 Dec 12, 2020 • edited Loading

Choose a reason for hiding this comment

PorridgePi Dec 12, 2020

Choose a reason for hiding this comment

PorridgePi Dec 12, 2020

Choose a reason for hiding this comment

niheaven commented May 11, 2024

Ash258 Dec 2, 2020 •

edited

Loading

PorridgePi Dec 2, 2020 •

edited

Loading

Ash258 Dec 12, 2020 •

edited

Loading