[pull] master from jaywcjlove:master

.github/FUNDING.yml

@@ -1,9 +1,4 @@
-# These are supported funding model platforms
-
 github: [jaywcjlove]
-patreon: # Replace with a single Patreon username
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # npm/linux-command
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-custom: https://jaywcjlove.github.io/sponsor.html
+#ko_fi: jaywcjlove
+#buy_me_a_coffee: jaywcjlove
+# custom: ["https://wangchujiang.com/#/sponsor"]

.github/workflows/ci.yml

@@ -7,24 +7,28 @@ on:
 jobs:
   build-deploy:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      id-token: write
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v6
+      - uses: actions/setup-node@v6
         with:
-          node-version: 16
+          node-version: 24
           registry-url: 'https://registry.npmjs.org'
 
       - name: Generate Contributors Images
         uses: jaywcjlove/github-action-contributors@main
         id: contributors
         with:
-          filter-author: (renovate\[bot\]|renovate-bot|dependabot\[bot\])
+          filter-author: (renovate\[bot\]|renovate-bot|@github-actions-bot|dependabot\[bot\])
           avatarSize: 42
 
       - name: Modify README.md
         uses: jaywcjlove/github-action-modify-file-content@main
         with:
           path: README.md
+          trim_whitespace: false
           openDelimiter: '<!--AUTO_GENERATED_PLEASE_DONT_DELETE_IT-->'
           closeDelimiter: '<!--AUTO_GENERATED_PLEASE_DONT_DELETE_IT-END-->'
           body: |
@@ -34,17 +38,21 @@ jobs:
         uses: jaywcjlove/github-action-modify-file-content@main
         with:
           path: template/contributors.ejs
+          trim_whitespace: false
           openDelimiter: '<!--AUTO_GENERATED_PLEASE_DONT_DELETE_IT-->'
           closeDelimiter: '<!--AUTO_GENERATED_PLEASE_DONT_DELETE_IT-END-->'
           body: |
             ${{steps.contributors.outputs.htmlList}}
 
+      - run: npm install
+      - run: npm run dash
+      - run: cp CONTRIBUTORS.svg .deploy
+
       - name: Build Linux Command
         run: |
           npm install
           npm run dash
           cp CONTRIBUTORS.svg .deploy
-          rm -rf .deploy/linux-command.docset 
 
       - name: Create Tag
         id: create_tag
@@ -58,16 +66,7 @@ jobs:
 
       - name: Update Dash Feed
         run: |
-          echo "<entry><version>${{steps.create_tag.outputs.versionNumber}}</version><url>https://jaywcjlove.github.io/linux-command/linux-command.docset.tgz</url></entry>" > .deploy/linux-command-docset.xml
-
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          commit_message: '[${{steps.tag_version.outputs.tag}}] ${{ github.event.head_commit.message }}'
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./.deploy
-          user_name: github-actions[bot]
-          user_email: github-actions[bot]@users.noreply.github.com
+          echo "<entry><version>${{steps.create_tag.outputs.versionNumber}}</version><url>https://github.com/jaywcjlove/linux-command/releases/download/${{steps.create_tag.outputs.version}}/linux-command.docset.tgz</url></entry>" > .deploy/linux-command-docset.xml
 
       - name: Generate Changelog
         id: changelog
@@ -80,7 +79,9 @@ jobs:
         uses: ncipollo/release-action@v1
         if: steps.create_tag.outputs.successful
         with:
+          allowUpdates: true
           artifacts: '.deploy/linux-command.docset.tgz'
+          draft: false
           token: ${{ secrets.GITHUB_TOKEN }}
           name: ${{ steps.create_tag.outputs.version }}
           tag: ${{ steps.create_tag.outputs.version }}
@@ -122,97 +123,44 @@ jobs:
             http://localhost:9665/
             ```
 
-      - run: npm publish
+      - run: rm -rf .deploy/linux-command.docset 
+      - run: rm -rf .deploy/linux-command.docset.tgz
+
+      - name: Deploy
+        uses: peaceiris/actions-gh-pages@v4
+        with:
+          commit_message: '[${{steps.tag_version.outputs.tag}}] ${{ github.event.head_commit.message }}'
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_dir: ./.deploy
+          user_name: github-actions[bot]
+          user_email: github-actions[bot]@users.noreply.github.com
+
+      - run: NODE_AUTH_TOKEN="" npm publish --access public --provenance
         continue-on-error: true
         name: 📦 linux-command publish to NPM
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
 
       # Create Docker Image
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build and push image:latest
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         with:
           push: true
           context: .
           platforms: linux/amd64,linux/arm64
           tags: ${{ secrets.DOCKER_USER }}/linux-command:latest
 
       - name: Build and push image:tags
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v6
         if: steps.create_tag.outputs.successful
         with:
           push: true
           context: .
           platforms: linux/amd64,linux/arm64
           tags: ${{ secrets.DOCKER_USER }}/linux-command:${{steps.changelog.outputs.version}}
-
-      # Create Docker Image in Github
-      - name: Login to the GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push image:latest
-        uses: docker/build-push-action@v3
-        with:
-          push: true
-          context: .
-          platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/jaywcjlove/linux-command:latest
-
-      - name: Build and push image:tags
-        uses: docker/build-push-action@v3
-        if: steps.create_tag.outputs.successful
-        with:
-          push: true
-          context: .
-          platforms: linux/amd64,linux/arm64
-          tags: ghcr.io/jaywcjlove/linux-command:${{steps.changelog.outputs.version}}
-
-      # # Create Docker Image
-      # - name: Docker login
-      #   run: docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
-
-      # - name: Build linux-command image
-      #   run: |
-      #     rm -rf .deploy/linux-command.docset.tgz
-      #     docker image build -t linux-command .
-
-      # - name: Tags & Push image(latest)
-      #   run: |
-      #     docker tag linux-command ${{ secrets.DOCKER_USER }}/linux-command:latest
-      #     docker push ${{ secrets.DOCKER_USER }}/linux-command:latest
-
-      # - name: Tags & Push image
-      #   if: steps.create_tag.outputs.successful
-      #   run: |
-      #     echo "outputs.tag - ${{ steps.changelog.outputs.version }}"
-      #     docker tag linux-command ${{ secrets.DOCKER_USER }}/linux-command:${{steps.changelog.outputs.version}}
-      #     docker push ${{ secrets.DOCKER_USER }}/linux-command:${{steps.changelog.outputs.version}}
-
-      # # Create Docker Image in Github
-      # - name: Login to GitHub registry
-      #   run: echo ${{ github.token }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
-
-      # - name: Build docker image
-      #   run: docker build -t ghcr.io/jaywcjlove/linux-command:latest .
-
-      # - name: Publish to GitHub registry
-      #   run: docker push ghcr.io/jaywcjlove/linux-command:latest
-
-      # - name: Tag docker image (beta) and publish to GitHub registry
-      #   if: steps.create_tag.outputs.successful
-      #   run: |
-      #       echo "version: v${{ steps.changelog.outputs.version }}"
-      #       docker tag ghcr.io/jaywcjlove/linux-command:latest ghcr.io/jaywcjlove/linux-command:${{steps.changelog.outputs.version}}
-      #       docker push ghcr.io/jaywcjlove/linux-command:${{steps.changelog.outputs.version}}

CONTRIBUTING.md

@@ -0,0 +1,61 @@
+# 贡献者约定
+
+感谢您对本项目提交贡献，为了便于维护者管理，请各位维护人员遵循以下约定
+
+## 如果您希望提交一个命令
+
+命令的存放位置在 `./command/` 文件夹中
+
+1. 在这里创建一个 `[CommandName].md` 文件，比如 `pacman.md`
+2. 打开文件，键入指令在终端中执行的命令
+3. 第二行输入三个等号
+4. 创建二级标题“补充说明”，并且在这个标题下面创建至少下面几个三级标题
+   - 语法
+   - 选项
+   - 参数
+
+按照预期，文档应该是这样的
+
+```markdown
+CommandName
+===
+
+这里是命令介绍，它可以被搜索到，如果你有个流行的应用，包含多个命令，可放到这里，以便搜索到对应的命令
+
+## 补充说明
+
+**CommandName命令** 是用于演示的文档
+
+### 语法
+
+(具体编写文档时，请使用 shell 代码块包裹以下内容)
+
+CommandName <-abcdABCD> <必选参数> [可选参数]
+
+### 选项
+
+(具体编写文档时，请使用 shell 代码块包裹以下内容)
+
+-a xxxxx
+-b xxxxx
+...
+-C xxxxx
+-D xxxxx
+
+### 参数
+
+(具体编写文档时，请使用 shell 代码块包裹以下内容)
+
+可选参数：一般情况下可以不给出
+
+```
+
+## 如果您希望维护前端页面
+
+- 请确保您的代码可以完整的运行在最新的 Chromium 和 Safari 浏览器 (#489)
+
+## 对于提交信息的其他规范
+
+- 约定式提交 <https://www.conventionalcommits.org/zh-hans/v1.0.0/>
+- 中文文案排版指北 <https://github.com/sparanoid/chinese-copywriting-guidelines/blob/master/README.zh-Hans.md>
+- 扉页 — Google 开源项目风格指南 <https://zh-google-styleguide.readthedocs.io/en/latest/google-shell-styleguide/>

Dockerfile

@@ -1,6 +1,6 @@
 # https://lipanski.com/posts/smallest-docker-image-static-website
-# https://github.com/lipanski/docker-static-website
-FROM lipanski/docker-static-website:latest
+# https://github.com/forksss/docker-static-website
+FROM wcjiang/docker-static-website:latest
 
 # Copy the static website
 # Use the .dockerignore file to control what ends up inside the image!