Skip to content

Commit

Permalink
Merge branch 'refs/heads/releases/v1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Conventional Changelog Action committed May 9, 2024
2 parents 3477ca4 + 03b9614 commit df627fc
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 7 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
## [1.2.3](https://github.com/leoli0605/npm-env-setup/compare/v1.2.2...v1.2.3) (2024-05-09)


### Bug Fixes

* add nasm for ffmpeg install ([4d58d66](https://github.com/leoli0605/npm-env-setup/commit/4d58d66fdc08cbc34a44c1a29ec214f820b0a628))



## [1.2.2](https://github.com/leoli0605/npm-env-setup/compare/v1.2.1...v1.2.2) (2024-05-09)


Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Open `powershell` and run the following command. This will start setting up your

<!-- WINDOWS_LINK_X64_START -->
```shell
powershell.exe -Command "Invoke-WebRequest -Uri https://github.com/leoli0605/npm-env-setup/releases/download/v1.2.2/env-setup-win-x64.exe -OutFile env-setup-win-x64.exe; Start-Process env-setup-win-x64.exe -Wait; Remove-Item env-setup-win-x64.exe -Force"
powershell.exe -Command "Invoke-WebRequest -Uri https://github.com/leoli0605/npm-env-setup/releases/download/v1.2.3/env-setup-win-x64.exe -OutFile env-setup-win-x64.exe; Start-Process env-setup-win-x64.exe -Wait; Remove-Item env-setup-win-x64.exe -Force"
```
<!-- WINDOWS_LINK_X64_END -->

Expand All @@ -47,15 +47,15 @@ For Mac users, the process is just as simple. Depending on the type of chip your

<!-- MACOS_LINK_X64_START -->
```shell
curl -L https://github.com/leoli0605/npm-env-setup/releases/download/v1.2.2/env-setup-macos-x64 -o env-setup-macos-x64 && chmod +x env-setup-macos-x64 && ./env-setup-macos-x64 && rm -f env-setup-macos-x64
curl -L https://github.com/leoli0605/npm-env-setup/releases/download/v1.2.3/env-setup-macos-x64 -o env-setup-macos-x64 && chmod +x env-setup-macos-x64 && ./env-setup-macos-x64 && rm -f env-setup-macos-x64
```
<!-- MACOS_LINK_X64_END -->

- If you have a newer Mac model with Apple's own chip (like the M1 or M2, found in Macs from late 2020 onwards):

<!-- MACOS_LINK_ARM64_START -->
```shell
curl -L https://github.com/leoli0605/npm-env-setup/releases/download/v1.2.2/env-setup-macos-arm64 -o env-setup-macos-arm64 && chmod +x env-setup-macos-arm64 && ./env-setup-macos-arm64 && rm -f env-setup-macos-arm64
curl -L https://github.com/leoli0605/npm-env-setup/releases/download/v1.2.3/env-setup-macos-arm64 -o env-setup-macos-arm64 && chmod +x env-setup-macos-arm64 && ./env-setup-macos-arm64 && rm -f env-setup-macos-arm64
```
<!-- MACOS_LINK_ARM64_END -->

Expand All @@ -65,7 +65,7 @@ For Linux users running Ubuntu 18.04 LTS or newer versions, execute the followin

<!-- LINUX_LINK_X64_START -->
```shell
curl -L https://github.com/leoli0605/npm-env-setup/releases/download/v1.2.2/env-setup-linux-x64 -o env-setup-linux-x64 && chmod +x env-setup-linux-x64 && ./env-setup-linux-x64 && rm -f env-setup-linux-x64
curl -L https://github.com/leoli0605/npm-env-setup/releases/download/v1.2.3/env-setup-linux-x64 -o env-setup-linux-x64 && chmod +x env-setup-linux-x64 && ./env-setup-linux-x64 && rm -f env-setup-linux-x64
```
<!-- LINUX_LINK_X64_END -->

Expand Down
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@
"Moba",
"mobaxterm",
"mulaRahul",
"nasm",
"Noto",
"obsproject",
"orbstack",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@leoli0605/env-setup",
"version": "1.2.2",
"version": "1.2.3",
"description": "\"\"",
"main": "./src/index.mjs",
"files": [
Expand Down
4 changes: 2 additions & 2 deletions packageData.json
Original file line number Diff line number Diff line change
Expand Up @@ -680,8 +680,8 @@
"ffmepg": {
"description": "影片處理 CLI 工具",
"install": {
"linux": "asdf plugin add ffmpeg && asdf install ffmpeg latest && asdf global ffmpeg latest",
"mac": "asdf plugin add ffmpeg && asdf install ffmpeg latest && asdf global ffmpeg latest",
"linux": "asdf plugin add nasm && asdf install nasm latest && asdf global nasm latest && asdf plugin add ffmpeg && asdf install ffmpeg latest && asdf global ffmpeg latest",
"mac": "asdf plugin add nasm && asdf install nasm latest && asdf global nasm latest && asdf plugin add ffmpeg && asdf install ffmpeg latest && asdf global ffmpeg latest",
"windows": "choco install ffmpeg -y"
},
"type": "enable"
Expand Down

0 comments on commit df627fc

Please sign in to comment.