update marbastlib to work with multiple projects in ebastler-kicad-re…

…pository
ebastler · Mar 31, 2024 · fc40149 · fc40149
1 parent 19deb9b
commit fc40149
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/kicad-pcm.yml b/.github/workflows/kicad-pcm.yml
@@ -42,4 +42,4 @@ jobs:
           ref: refs/heads/main
           repo: ebastler/ebastler-kicad-repository
           token: ${{ secrets.PERSONAL_TOKEN }}
-          inputs: '{ "VERSION": "${{env.VERSION}}", "DOWNLOAD_SHA256": "${{env.DOWNLOAD_SHA256}}", "DOWNLOAD_SIZE": "${{env.DOWNLOAD_SIZE}}", "DOWNLOAD_URL": "${{env.DOWNLOAD_URL}}", "INSTALL_SIZE": "${{env.INSTALL_SIZE}}", "KICAD_VERSION": "${{env.KICAD_VERSION}}" }'
+          inputs: '{ "VERSION": "${{env.VERSION}}", "DOWNLOAD_SHA256": "${{env.DOWNLOAD_SHA256}}", "DOWNLOAD_SIZE": "${{env.DOWNLOAD_SIZE}}", "DOWNLOAD_URL": "${{env.DOWNLOAD_URL}}", "INSTALL_SIZE": "${{env.INSTALL_SIZE}}", "KICAD_VERSION": "${{env.KICAD_VERSION}}", "PROJECT_NAME": "${{env.PROJECT_NAME}}" }'
diff --git a/PCM/create_pcm_archive.sh b/PCM/create_pcm_archive.sh
@@ -42,5 +42,5 @@ echo VERSION=$VERSION >> $GITHUB_ENV
 echo DOWNLOAD_SHA256=$(shasum --algorithm 256 PCM/KiCAD-PCM-$VERSION.zip | xargs | cut -d' ' -f1) >> $GITHUB_ENV
 echo DOWNLOAD_SIZE=$(ls -l PCM/KiCAD-PCM-$VERSION.zip | xargs | cut -d' ' -f5) >> $GITHUB_ENV
 echo DOWNLOAD_URL="https:\/\/github.com\/ebastler\/marbastlib\/releases\/download\/$VERSION\/KiCAD-PCM-$VERSION.zip" >> $GITHUB_ENV
-echo INSTALL_SIZE=$(unzip -l PCM/KiCAD-PCM-$VERSION.zip | tail -1 | xargs | cut -d' ' -f1) >> $GITHUB_ENV
-echo KICAD_VERSION=$(grep kicad_version metadata.template.json |grep -o -E "[0-9]+\.[0-9]" PCM/metadata.template.json) >> $GITHUB_ENV
+echo KICAD_VERSION=$(grep -oP '(?<="kicad_version": ")[^"]*' PCM/metadata.template.json) >> $GITHUB_ENV
+echo PROJECT_NAME=$(grep name PCM/metadata.template.json | head -1 | grep -oP '(?<="name": ")[^"]*') >> $GITHUB_ENV