feat(shim): Rework shimming logic by rashil2000 · Pull Request #4543 · ScoopInstaller/Scoop

rashil2000 · 2021-11-28T19:55:45Z

The .ps1 shims are now only created when the bin entry itself is a .ps1 script.

Closes #3749
Closes #2018
Closes #4486
Closes #3850
Closes #3795
Closes #4003
Closes #3890
Closes #4216
Closes #4473
Closes #3699
Closes #4413
Closes #4545
Closes #3851

Closes #4333
Closes #3877
Closes #4376

Related #3915
Related #2230

rashil2000 · 2021-11-29T17:02:42Z

The scoop which functionality in this PR is currently broken (it always points to the shim directory for batch scripts), as it always relied on a .ps1 file being present.

@niheaven is there a way to extract the app path from batch scripts (similar to .exe/.shim and .ps1 files)?

rashil2000 · 2021-11-30T13:35:51Z

@niheaven this is ready for review.

niheaven

The ps1 shim also has PATH comment, right?

rashil2000 · 2021-12-02T05:51:24Z

Select-Object is used because it can fail gracefully.

Using [] will throw an error if the index (or the array itself) doesn't exist (which will be the case for older existing ps1 shims), and then we'll have to use a try-catch block or something other to first detect the error and then write a fallback.

In case of Select-Object, we can directly use a fallback (as is done here).

niheaven · 2021-12-02T06:20:16Z

I've changed two expression that use regex to clarify what we really want.

rashil2000 · 2021-12-02T08:05:31Z

Done

niheaven · 2021-12-02T13:23:28Z

Let's begin testing it!

chawyehsu · 2021-12-03T00:51:36Z

you shouldn't close those issues when the fix hasn't been shipped to master...

rashil2000 · 2021-12-03T02:45:57Z

I closed them with the idea that people can test the develop branch if they want to

chawyehsu · 2021-12-03T04:06:55Z

You can notify them by just leaving a comment instead of directly closing the issue which is not fixed “officially”...

@filmor

Related PRs: - #4531 @filmor - ac71fcc @niheaven - #4535 @rashil2000 - #4522 @pratikpc - #4550 @niheaven - #4528 @niheaven - #4532 @MrNuggelz - #4155 @MrNuggelz Co-authored-by: @rashil2000 - #4581 @niheaven - fb496c4 @rashil2000 - #4543 @rashil2000 Co-authored-by: @niheaven - #4555 @rashil2000 - 3c90d1a @rashil2000 - 2ec00d5 @rashil2000 - #4567 @rashil2000 - cbe29ed @rashil2000 - #4570 @niheaven - #4582 @niheaven - #4571 @niheaven - #3244 @nickbudi - #3821 @jfastnacht Co-authored-by: @rasa - #4578 @tukanos - #4579 @rashil2000 Co-authored-by: Hsiao-nan Cheung <niheaven@gmail.com> Co-authored-by: Rashil Gandhi <46838874+rashil2000@users.noreply.github.com> Co-authored-by: Jakub Čábera <cabera.jakub@gmail.com> Co-authored-by: Ross Smith II <ross@smithii.com> Co-authored-by: Benedikt Reinartz <filmor@gmail.com> Co-authored-by: Joris <MrNuggelz@users.noreply.github.com> Co-authored-by: Pratik Chowdhury <pratikc@live.co.uk> Co-authored-by: Rashil Gandhi <rashil2000@gmail.com> Co-authored-by: nickbudi <nickbudi@users.noreply.github.com> Co-authored-by: Julian <github@fastnacht.consulting> Co-authored-by: tukanos <patrik.svestka@gmail.com>

adamency · 2022-01-17T21:54:34Z

How is this related to #2230 ?

rashil2000 · 2022-01-18T02:40:06Z

It concerns shims

niheaven · 2022-01-18T12:35:27Z

Does this fix #2230 and #3915? What should we do now?

rashil2000 · 2022-01-18T12:37:39Z

Does this fix #2230 and #3915? What should we do now?

I think that problem can be solved by using relative paths in batch and bash shims too (ps1 shim already uses relative paths). But it will require careful testing, and rework of scoop-which also.

niheaven · 2022-01-18T13:30:58Z

I think that problem can be solved by using relative paths in batch and bash shims too (ps1 shim already uses relative paths). But it will require careful testing, and rework of scoop-which also.

Please take your times to do the jobs.

Co-authored-by: Hsiao-nan Cheung <niheaven@gmail.com>

@filmor

Related PRs: - ScoopInstaller#4531 @filmor - ac71fcc @niheaven - ScoopInstaller#4535 @rashil2000 - ScoopInstaller#4522 @pratikpc - ScoopInstaller#4550 @niheaven - ScoopInstaller#4528 @niheaven - ScoopInstaller#4532 @MrNuggelz - ScoopInstaller#4155 @MrNuggelz Co-authored-by: @rashil2000 - ScoopInstaller#4581 @niheaven - fb496c4 @rashil2000 - ScoopInstaller#4543 @rashil2000 Co-authored-by: @niheaven - ScoopInstaller#4555 @rashil2000 - 3c90d1a @rashil2000 - 2ec00d5 @rashil2000 - ScoopInstaller#4567 @rashil2000 - cbe29ed @rashil2000 - ScoopInstaller#4570 @niheaven - ScoopInstaller#4582 @niheaven - ScoopInstaller#4571 @niheaven - ScoopInstaller#3244 @nickbudi - ScoopInstaller#3821 @jfastnacht Co-authored-by: @rasa - ScoopInstaller#4578 @tukanos - ScoopInstaller#4579 @rashil2000 Co-authored-by: Hsiao-nan Cheung <niheaven@gmail.com> Co-authored-by: Rashil Gandhi <46838874+rashil2000@users.noreply.github.com> Co-authored-by: Jakub Čábera <cabera.jakub@gmail.com> Co-authored-by: Ross Smith II <ross@smithii.com> Co-authored-by: Benedikt Reinartz <filmor@gmail.com> Co-authored-by: Joris <MrNuggelz@users.noreply.github.com> Co-authored-by: Pratik Chowdhury <pratikc@live.co.uk> Co-authored-by: Rashil Gandhi <rashil2000@gmail.com> Co-authored-by: nickbudi <nickbudi@users.noreply.github.com> Co-authored-by: Julian <github@fastnacht.consulting> Co-authored-by: tukanos <patrik.svestka@gmail.com>

rashil2000 added 4 commits November 29, 2021 01:13

Rework shimming logic

1a7147f

Make kiennq shim the default

128a0e0

fix

52b5936

Update tests

240de06

rashil2000 requested review from issaclin32 and niheaven November 28, 2021 20:21

rasa reviewed Nov 28, 2021

View reviewed changes

Comment thread lib/core.ps1

rashil2000 added 2 commits November 29, 2021 11:28

prevent error if kiennq is already set

c89cec5

hmm

427bc6c

issaclin32 approved these changes Nov 29, 2021

View reviewed changes

try fixing scoop-which

98df9c1

f

968e38b

rashil2000 force-pushed the ps1-shim branch from e5bb146 to 968e38b Compare November 29, 2021 17:51

niheaven reviewed Nov 29, 2021

View reviewed changes

Comment thread libexec/scoop-which.ps1 Outdated

rashil2000 added 4 commits November 30, 2021 01:24

quote bash path

a8ba2a5

add comment indicating program path

4bbffb9

detect if pwsh is installed for ps1 scripts

d839952

handle .cmd scripts in scoop-which

28c70da

niheaven reviewed Nov 30, 2021

View reviewed changes

Comment thread libexec/scoop-which.ps1 Outdated

rasa reviewed Dec 1, 2021

View reviewed changes

Comment thread lib/core.ps1

rashil2000 added 2 commits December 1, 2021 22:23

use common regex for finding path

e093a2b

emit exit code in ps1 shim

b023739

niheaven requested changes Dec 2, 2021

View reviewed changes

Comment thread libexec/scoop-which.ps1 Outdated

Comment thread libexec/scoop-which.ps1

Comment thread libexec/scoop-which.ps1 Outdated

Apply suggestions from code review

8263a58

Small opt and fix test

95c6e22

niheaven merged commit ef4349b into develop Dec 2, 2021

niheaven deleted the ps1-shim branch December 2, 2021 13:23

niheaven mentioned this pull request Dec 24, 2021

Merge branch 'develop' into 'master' #4594

Merged

se35710 pushed a commit to se35710/scoop that referenced this pull request Mar 8, 2022

feat(shim): Rework shimming logic (ScoopInstaller#4543)

c7ba268

Co-authored-by: Hsiao-nan Cheung <niheaven@gmail.com>

Uh oh!

Conversation

rashil2000 commented Nov 28, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

rashil2000 commented Nov 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

rashil2000 commented Nov 30, 2021

Uh oh!

niheaven left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rashil2000 commented Dec 2, 2021

Uh oh!

niheaven commented Dec 2, 2021

Uh oh!

rashil2000 commented Dec 2, 2021

Uh oh!

niheaven commented Dec 2, 2021

Uh oh!

chawyehsu commented Dec 3, 2021

Uh oh!

rashil2000 commented Dec 3, 2021

Uh oh!

chawyehsu commented Dec 3, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

adamency commented Jan 17, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rashil2000 commented Jan 18, 2022

Uh oh!

niheaven commented Jan 18, 2022

Uh oh!

rashil2000 commented Jan 18, 2022

Uh oh!

niheaven commented Jan 18, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

rashil2000 commented Nov 28, 2021 •

edited

Loading

rashil2000 commented Nov 29, 2021 •

edited

Loading

chawyehsu commented Dec 3, 2021 •

edited

Loading

adamency commented Jan 17, 2022 •

edited

Loading