Skip to content

Commit 4f2ba1c

Browse files
committed
Reformat some things
1 parent d97e172 commit 4f2ba1c

File tree

243 files changed

+2819
-1555
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

243 files changed

+2819
-1555
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ body:
5959
placeholder: |
6060
PS> scoop --version
6161
Current Scoop version:
62-
c60df9cd (HEAD -> develop, origin/develop) docs(changelog): Prepare for version 0.3.1 (#5248)
62+
c60df9cd (HEAD -> develop, origin/develop) chore(release): Bump to version 0.3.0
6363
6464
'extras' bucket:
6565
ea314b213 (HEAD -> master, origin/master, origin/HEAD) lazygit: Update to version 0.36.0

.github/workflows/ci.yml

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
name: Tests
22

33
on:
4-
push:
5-
branches:
6-
- 'main'
7-
- 'master'
84
pull_request:
5+
push:
96
workflow_dispatch:
107

118
jobs:
@@ -17,21 +14,17 @@ jobs:
1714
uses: actions/checkout@main
1815
with:
1916
fetch-depth: 2
20-
path: my_bucket
17+
path: 'my_bucket'
2118
- name: Checkout Scoop
2219
uses: actions/checkout@main
2320
with:
2421
repository: ScoopInstaller/Scoop
25-
path: scoop_core
26-
- name: Init Test Suite
27-
uses: potatoqualitee/psmodulecache@v5.1
28-
with:
29-
modules-to-cache: BuildHelpers
30-
shell: powershell
31-
- name: Test Bucket
22+
path: 'scoop_core'
23+
- name: Init and Test
3224
shell: powershell
3325
run: |
3426
$env:SCOOP_HOME="$(Convert-Path '.\scoop_core')"
27+
.\scoop_core\test\bin\init.ps1
3528
.\my_bucket\bin\test.ps1
3629
test_pwsh:
3730
name: PowerShell
@@ -41,19 +34,15 @@ jobs:
4134
uses: actions/checkout@main
4235
with:
4336
fetch-depth: 2
44-
path: my_bucket
37+
path: 'my_bucket'
4538
- name: Checkout Scoop
4639
uses: actions/checkout@main
4740
with:
4841
repository: ScoopInstaller/Scoop
49-
path: scoop_core
50-
- name: Init Test Suite
51-
uses: potatoqualitee/psmodulecache@v5.1
52-
with:
53-
modules-to-cache: BuildHelpers
54-
shell: pwsh
55-
- name: Test Bucket
42+
path: 'scoop_core'
43+
- name: Init and Test
5644
shell: pwsh
5745
run: |
5846
$env:SCOOP_HOME="$(Convert-Path '.\scoop_core')"
47+
.\scoop_core\test\bin\init.ps1
5948
.\my_bucket\bin\test.ps1

.github/workflows/excavator.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
name: Excavate
1010
runs-on: windows-latest
1111
steps:
12-
- uses: actions/checkout@main
13-
- name: Excavate
14-
uses: ScoopInstaller/GithubActions@main
15-
env:
16-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17-
SKIP_UPDATED: 1
12+
- uses: actions/checkout@main
13+
- name: Excavate
14+
uses: ScoopInstaller/GithubActions@main
15+
env:
16+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
17+
SKIP_UPDATED: '1'
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
on:
22
issue_comment:
3-
types: [created]
3+
types: [ created ]
44
name: Commented Pull Request
55
jobs:
66
pullRequestHandler:
77
name: PullRequestHandler
88
runs-on: windows-latest
99
steps:
10-
- uses: actions/checkout@main
11-
- name: PullRequestHandler
12-
uses: ScoopInstaller/GithubActions@main
13-
if: startsWith(github.event.comment.body, '/verify')
14-
env:
15-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10+
- uses: actions/checkout@main
11+
- name: PullRequestHandler
12+
uses: ScoopInstaller/GithubActions@main
13+
if: startsWith(github.event.comment.body, '/verify')
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/issues.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
on:
22
issues:
3-
types: [opened, labeled]
3+
types: [ opened, labeled ]
44
name: Issues
55
jobs:
66
issueHandler:
77
name: IssueHandler
88
runs-on: windows-latest
99
steps:
10-
- uses: actions/checkout@main
11-
- name: IssueHandler
12-
uses: ScoopInstaller/GithubActions@main
13-
if: github.event.action == 'opened' || (github.event.action == 'labeled' && contains(github.event.issue.labels.*.name, 'verify'))
14-
env:
15-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10+
- uses: actions/checkout@main
11+
- name: IssueHandler
12+
uses: ScoopInstaller/GithubActions@main
13+
if: github.event.action == 'opened' || (github.event.action == 'labeled' && contains(github.event.issue.labels.*.name, 'verify'))
14+
env:
15+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pull_request.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
on:
2-
pull_request:
3-
types: [opened]
2+
pull_request_target:
3+
types: [ opened ]
44
name: Pull Requests
55
jobs:
66
pullRequestHandler:
77
name: PullRequestHandler
88
runs-on: windows-latest
99
steps:
10-
- uses: actions/checkout@main
11-
- name: PullRequestHandler
12-
uses: ScoopInstaller/GithubActions@main
13-
env:
14-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
10+
- uses: actions/checkout@main
11+
- name: PullRequestHandler
12+
uses: ScoopInstaller/GithubActions@main
13+
env:
14+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/schedule.yml

Lines changed: 0 additions & 16 deletions
This file was deleted.

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"recommendations": [
33
"EditorConfig.EditorConfig",
4-
"ms-vscode.PowerShell"
4+
"ms-vscode.PowerShell",
5+
"richie5um2.vscode-sort-json"
56
]
67
}

.vscode/settings.json

Lines changed: 102 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,112 @@
99
"powershell.codeFormatting.ignoreOneLineBlock": true,
1010
"json.schemas": [
1111
{
12-
"url": "https://raw.githubusercontent.com/ScoopInstaller/Scoop/master/schema.json",
12+
"url": "https://raw.githubusercontent.com/scoopinstaller/scoop/master/schema.json",
1313
"fileMatch": [
14-
"bucket/**/*.json"
14+
"bucket/*.json"
1515
]
1616
}
1717
],
1818
"files.exclude": {
1919
"**/.git": true,
20-
"**/.svn": true,
21-
"**/.hg": true,
22-
"**/CVS": true,
23-
"**/.DS_Store": true,
24-
"**/tmp": true
25-
}
20+
"**/.DS_Store": true
21+
},
22+
"cSpell.words": [
23+
"appdata",
24+
"autoupdate",
25+
"basever",
26+
"beyondmeat",
27+
"Calinou",
28+
"checkurls",
29+
"checkver",
30+
"citra",
31+
"createconfig",
32+
"ctrlr",
33+
"Famicom",
34+
"hermanjustnu",
35+
"HOMEDRIVE",
36+
"HOMEPATH",
37+
"lukesampson",
38+
"MAME",
39+
"memstick",
40+
"mesen",
41+
"mklink",
42+
"msvc",
43+
"ppsspp",
44+
"Retroarch",
45+
"RPCS",
46+
"Ryujinx",
47+
"useb",
48+
"visualboyadvance",
49+
"yuzu"
50+
],
51+
"sortJSON.orderOverride": [
52+
"version",
53+
"description",
54+
"homepage",
55+
"license",
56+
"notes",
57+
"depends",
58+
"suggest",
59+
"identifier",
60+
"url",
61+
"hash",
62+
"architecture",
63+
"extract_dir",
64+
"extract_to",
65+
"pre_install",
66+
"installer",
67+
"post_install",
68+
"env_add_path",
69+
"env_set",
70+
"bin",
71+
"shortcuts",
72+
"persist",
73+
"pre_uninstall",
74+
"uninstaller",
75+
"post_uninstall",
76+
"checkver",
77+
"autoupdate"
78+
],
79+
"editor.codeActionsOnSave": {
80+
"source.fixAll": "explicit",
81+
"source.fixAll.sortJSON": "explicit"
82+
},
83+
84+
"sort-json.settings.orderOverride": [
85+
"version",
86+
"description",
87+
"homepage",
88+
"license",
89+
"notes",
90+
"depends",
91+
"suggest",
92+
"identifier",
93+
"url",
94+
"hash",
95+
"architecture",
96+
"extract_dir",
97+
"extract_to",
98+
"pre_install",
99+
"installer",
100+
"post_install",
101+
"env_add_path",
102+
"env_set",
103+
"bin",
104+
"shortcuts",
105+
"persist",
106+
"pre_uninstall",
107+
"uninstaller",
108+
"post_uninstall",
109+
"checkver",
110+
"autoupdate"
111+
],
112+
"[json]": {
113+
"editor.defaultFormatter": "vscode.json-language-features",
114+
"files.insertFinalNewline": true
115+
},
116+
"editor.defaultFormatter": "richie5um2.vscode-sort-json",
117+
"editor.formatOnSave": true,
118+
"prettier.enable": false,
119+
"html.format.enable": false
26120
}

LICENSE.md

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
## creative commons
2+
3+
# CC0 1.0 Universal
4+
5+
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED HEREUNDER.
6+
7+
### Statement of Purpose
8+
9+
The laws of most jurisdictions throughout the world automatically confer exclusive Copyright and Related Rights (defined below) upon the creator and subsequent owner(s) (each and all, an "owner") of an original work of authorship and/or a database (each, a "Work").
10+
11+
Certain owners wish to permanently relinquish those rights to a Work for the purpose of contributing to a commons of creative, cultural and scientific works ("Commons") that the public can reliably and without fear of later claims of infringement build upon, modify, incorporate in other works, reuse and redistribute as freely as possible in any form whatsoever and for any purposes, including without limitation commercial purposes. These owners may contribute to the Commons to promote the ideal of a free culture and the further production of creative, cultural and scientific works, or to gain reputation or greater distribution for their Work in part through the use and efforts of others.
12+
13+
For these and/or other purposes and motivations, and without any expectation of additional consideration or compensation, the person associating CC0 with a Work (the "Affirmer"), to the extent that he or she is an owner of Copyright and Related Rights in the Work, voluntarily elects to apply CC0 to the Work and publicly distribute the Work under its terms, with knowledge of his or her Copyright and Related Rights in the Work and the meaning and intended legal effect of CC0 on those rights.
14+
15+
1. __Copyright and Related Rights.__ A Work made available under CC0 may be protected by copyright and related or neighboring rights ("Copyright and Related Rights"). Copyright and Related Rights include, but are not limited to, the following:
16+
17+
i. the right to reproduce, adapt, distribute, perform, display, communicate, and translate a Work;
18+
19+
ii. moral rights retained by the original author(s) and/or performer(s);
20+
21+
iii. publicity and privacy rights pertaining to a person's image or likeness depicted in a Work;
22+
23+
iv. rights protecting against unfair competition in regards to a Work, subject to the limitations in paragraph 4(a), below;
24+
25+
v. rights protecting the extraction, dissemination, use and reuse of data in a Work;
26+
27+
vi. database rights (such as those arising under Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, and under any national implementation thereof, including any amended or successor version of such directive); and
28+
29+
vii. other similar, equivalent or corresponding rights throughout the world based on applicable law or treaty, and any national implementations thereof.
30+
31+
2. __Waiver.__ To the greatest extent permitted by, but not in contravention of, applicable law, Affirmer hereby overtly, fully, permanently, irrevocably and unconditionally waives, abandons, and surrenders all of Affirmer's Copyright and Related Rights and associated claims and causes of action, whether now known or unknown (including existing as well as future claims and causes of action), in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each member of the public at large and to the detriment of Affirmer's heirs and successors, fully intending that such Waiver shall not be subject to revocation, rescission, cancellation, termination, or any other legal or equitable action to disrupt the quiet enjoyment of the Work by the public as contemplated by Affirmer's express Statement of Purpose.
32+
33+
3. __Public License Fallback.__ Should any part of the Waiver for any reason be judged legally invalid or ineffective under applicable law, then the Waiver shall be preserved to the maximum extent permitted taking into account Affirmer's express Statement of Purpose. In addition, to the extent the Waiver is so judged Affirmer hereby grants to each affected person a royalty-free, non transferable, non sublicensable, non exclusive, irrevocable and unconditional license to exercise Affirmer's Copyright and Related Rights in the Work (i) in all territories worldwide, (ii) for the maximum duration provided by applicable law or treaty (including future time extensions), (iii) in any current or future medium and for any number of copies, and (iv) for any purpose whatsoever, including without limitation commercial, advertising or promotional purposes (the "License"). The License shall be deemed effective as of the date CC0 was applied by Affirmer to the Work. Should any part of the License for any reason be judged legally invalid or ineffective under applicable law, such partial invalidity or ineffectiveness shall not invalidate the remainder of the License, and in such case Affirmer hereby affirms that he or she will not (i) exercise any of his or her remaining Copyright and Related Rights in the Work or (ii) assert any associated claims and causes of action with respect to the Work, in either case contrary to Affirmer's express Statement of Purpose.
34+
35+
4. __Limitations and Disclaimers.__
36+
37+
a. No trademark or patent rights held by Affirmer are waived, abandoned, surrendered, licensed or otherwise affected by this document.
38+
39+
b. Affirmer offers the Work as-is and makes no representations or warranties of any kind concerning the Work, express, implied, statutory or otherwise, including without limitation warranties of title, merchantability, fitness for a particular purpose, non infringement, or the absence of latent or other defects, accuracy, or the present or absence of errors, whether or not discoverable, all to the greatest extent permissible under applicable law.
40+
41+
c. Affirmer disclaims responsibility for clearing rights of other persons that may apply to the Work or any use thereof, including without limitation any person's Copyright and Related Rights in the Work. Further, Affirmer disclaims responsibility for obtaining any necessary consents, permissions or other rights required for any use of the Work.
42+
43+
d. Affirmer understands and acknowledges that Creative Commons is not a party to this document and has no duty or obligation with respect to this CC0 or use of the Work.

0 commit comments

Comments
 (0)