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

Add rainmeter-portable: feedback needed #2021

Merged
merged 4 commits into from
Apr 20, 2019

Conversation

Skrity
Copy link
Contributor

@Skrity Skrity commented Apr 17, 2019

There was a problem with unpacking different architectures in #694. Looking for input on this solution: it works, persistence isn't trivial here, but to my knowledge I managed to persist everything.

"if((Get-Content \"$dir\\Rainmeter.ini\") -eq $Null) { Copy-Item \"$dir\\Defaults\\Layouts\\illustro default\\Rainmeter.ini\", \"$dir\\Defaults\\Skins\", \"$dir\\Defaults\\Layouts\" \"$persist_dir\" -Force -Recurse | Out-Null }", makes default welcome skins appear on new installation.

"if(Test-Path \"$dir\\Plugins.original\") { Copy-Item \"$dir\\Plugins.original\\*\" \"$persist_dir\\Plugins\" -Force -Recurse; Remove-Item \"$dir\\Plugins.original\" -Force -Recurse | Out-Null }", updates default plugins in case of an update.

Copy link
Contributor

@Ash258 Ash258 left a comment

Choose a reason for hiding this comment

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

Fix for post_install will follow

bucket/rainmeter-portable.json Show resolved Hide resolved
@r15ch13
Copy link
Member

r15ch13 commented Apr 17, 2019

Using the overwrite mode is a neat trick. 😄

@Ash258
Copy link
Contributor

Ash258 commented Apr 17, 2019

And for that installation steps. You assume that first file is for 32bit and second file is for 64bit right? (If they have same name)

F

],
"bin": [
"Rainmeter.exe",
"SkinInstaller.exe"
Copy link
Contributor

Choose a reason for hiding this comment

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

Is it really neede to shim SkinInstaller?? Does this have some command line handler?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

You can pass skin file to it, that's as far as I know, I just iterated on existing rainmeter.json.

@Skrity
Copy link
Contributor Author

Skrity commented Apr 17, 2019

Yeah, the second portion of binaries is the "64-bit mode" option in installer. The existing rainmeter.json does this as well, just the default mode is "always overwrite".
Also maybe we can somehow pass -ao parameter via extract_7zip, that will eliminate the need for explicit 7zip dependency? But It seems that will require a patch to scoop.

@Skrity
Copy link
Contributor Author

Skrity commented Apr 17, 2019

How would I go about naming the shortcut: "Rainmeter (portable)" will allow for two shortcuts from rainmeter and rainmeter-portable to coexist, or is it a non-supported scenario?
This also should apply to #2014, didn't even consider it until now.

@niheaven
Copy link
Member

niheaven commented Apr 18, 2019

No need to #/inst.exe, you could use `7z x "$dir\$fname"

@r15ch13 r15ch13 merged commit b2a5ff5 into ScoopInstaller:master Apr 20, 2019
r15ch13 pushed a commit to ScoopInstaller/Scoop that referenced this pull request Apr 29, 2019
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
@Skrity Skrity deleted the rainmeter branch May 24, 2019 19:40
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.

4 participants