Merge pull request #212 from kloptops/main

Fixed $CFW_GLIBC output in device_info.txt, Added trimui.portmaster.zip generation.
PortsMaster · Jan 19, 2025 · a300329 · a300329
2 parents a4182e0 + d8af9e0
commit a300329
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.github/workflows/release-alpha.yaml b/.github/workflows/release-alpha.yaml
@@ -99,7 +99,7 @@ jobs:
           replacesArtifacts: false
           omitNameDuringUpdate: true
           body: "Release: ${{steps.version.outputs.version}} (${{steps.version.outputs.release}})"
-          artifacts: "PortMaster.zip, PortMaster.zip.md5, version, version.json, Install*PortMaster.sh, muos.portmaster.zip, muos.portmaster.zip.md5, retrodeck.portmaster.zip, retrodeck.portmaster.zip.md5"
+          artifacts: "PortMaster.zip, PortMaster.zip.md5, version, version.json, Install*PortMaster.sh, muos.portmaster.zip, muos.portmaster.zip.md5, retrodeck.portmaster.zip, retrodeck.portmaster.zip.md5, trimui.portmaster.zip, trimui.portmaster.zip.md5"
           token: ${{ secrets.GITHUB_TOKEN }}
           repo: ${{ steps.env.outputs.RELEASE_REPO }}
           owner: ${{ steps.env.outputs.RELEASE_ORG }}

diff --git a/.github/workflows/release-beta.yaml b/.github/workflows/release-beta.yaml
@@ -99,7 +99,7 @@ jobs:
           replacesArtifacts: false
           omitNameDuringUpdate: true
           body: "Release: ${{steps.version.outputs.version}} (${{steps.version.outputs.release}})"
-          artifacts: "PortMaster.zip, PortMaster.zip.md5, version, version.json, Install*PortMaster.sh, muos.portmaster.zip, muos.portmaster.zip.md5, retrodeck.portmaster.zip, retrodeck.portmaster.zip.md5"
+          artifacts: "PortMaster.zip, PortMaster.zip.md5, version, version.json, Install*PortMaster.sh, muos.portmaster.zip, muos.portmaster.zip.md5, retrodeck.portmaster.zip, retrodeck.portmaster.zip.md5, trimui.portmaster.zip, trimui.portmaster.zip.md5"
           token: ${{ secrets.GITHUB_TOKEN }}
           repo: ${{ steps.env.outputs.RELEASE_REPO }}
           owner: ${{ steps.env.outputs.RELEASE_ORG }}

diff --git a/.github/workflows/release-stable.yaml b/.github/workflows/release-stable.yaml
@@ -99,7 +99,7 @@ jobs:
           replacesArtifacts: false
           omitNameDuringUpdate: true
           body: "Release: ${{steps.version.outputs.version}} (${{steps.version.outputs.release}})"
-          artifacts: "PortMaster.zip, PortMaster.zip.md5, version, version.json, Install*PortMaster.sh, muos.portmaster.zip, muos.portmaster.zip.md5, retrodeck.portmaster.zip, retrodeck.portmaster.zip.md5"
+          artifacts: "PortMaster.zip, PortMaster.zip.md5, version, version.json, Install*PortMaster.sh, muos.portmaster.zip, muos.portmaster.zip.md5, retrodeck.portmaster.zip, retrodeck.portmaster.zip.md5, trimui.portmaster.zip, trimui.portmaster.zip.md5"
           token: ${{ secrets.GITHUB_TOKEN }}
           repo: ${{ steps.env.outputs.RELEASE_REPO }}
           owner: ${{ steps.env.outputs.RELEASE_ORG }}

diff --git a/PortMaster/device_info.txt b/PortMaster/device_info.txt
@@ -5,6 +5,9 @@
 
 ## New Device Info
 #
+# - DEVICE_INFO_VERSION
+# - PM_VERSION
+# - DISPLAY_ORIENTATION
 # - DISPLAY_WIDTH
 # - DISPLAY_HEIGHT
 # - DISPLAY_ORIENTATION
@@ -19,6 +22,8 @@
 # - DEVICE_HAS_AARCH64
 # - DEVICE_HAS_X86
 # - DEVICE_HAS_X86_64
+# - ASPECT_X
+# - ASPECT_Y
 # - ANALOG_STICKS
 #
 # usage `source <path_to>/device_info.txt`
@@ -350,7 +355,7 @@ esac
 
 CFW_GLIBC="230"
 
-for path in '/lib /lib64 /lib/aarch64-linux-gnu /lib32 /lib/arm-linux-gnueabihf /usr/lib /usr/lib64 /usr/lib32'; do
+for path in /lib /lib64 /lib/aarch64-linux-gnu /lib32 /lib/arm-linux-gnueabihf /usr/lib /usr/lib64 /usr/lib32; do
     libc="$path/libc.so.6"
     if [ -x "$libc" ]; then
         CFW_GLIBC=$("$libc" 2>&1 | head -n 1 | awk '{print $NF}' | tr -d '.')
@@ -427,9 +432,9 @@ DEVICE_HAS_X86="${DEVICE_HAS_X86}"
 DEVICE_HAS_X86_64="${DEVICE_HAS_X86_64}"
 DISPLAY_WIDTH=${DISPLAY_WIDTH}
 DISPLAY_HEIGHT=${DISPLAY_HEIGHT}
+DISPLAY_ORIENTATION=${DISPLAY_ORIENTATION}
 ASPECT_X=${ASPECT_X}
 ASPECT_Y=${ASPECT_Y}
-DISPLAY_ORIENTATION=${DISPLAY_ORIENTATION}
 ANALOG_STICKS=${ANALOG_STICKS}
 \`\`\`
 __INFO_DUMP__