Merge pull request #35 from gerlero/action

Improve APT repository setup

Author: gerlero

action.yml

@@ -36,22 +36,22 @@ runs:
           echo "openfoam-app-version=$(brew info gerlero/openfoam/openfoam | head -n 1 | awk '{print $3}')" >> "$GITHUB_OUTPUT"
           echo "openfoam-etc=/Applications/OpenFOAM-v${{ inputs.openfoam-version }}.app/Contents/Resources/etc" >> "$GITHUB_OUTPUT"
         elif [ ${{ inputs.openfoam-version }} -lt 1000 ]; then
-          sudo cp $GITHUB_ACTION_PATH/gpg.key /etc/apt/trusted.gpg.d/openfoam.asc
-          sudo bash -c "echo \"deb [arch=$(dpkg --print-architecture)] http://dl.openfoam.org/ubuntu $(sed -ne 's/^VERSION_CODENAME=//p' /etc/os-release) main\" > /etc/apt/sources.list.d/openfoam.list"
-          echo "apt-packages=openfoam${{ inputs.openfoam-version }}" >> $GITHUB_OUTPUT
+          sudo cp $GITHUB_ACTION_PATH/gpg.key /etc/apt/trusted.gpg.d/openfoam-org.asc
+          sudo bash -c "echo \"deb [arch=$(dpkg --print-architecture)] http://dl.openfoam.org/ubuntu $(sed -ne 's/^VERSION_CODENAME=//p' /etc/os-release) main\" > /etc/apt/sources.list.d/openfoam-org.list"
+          echo "apt-package=openfoam${{ inputs.openfoam-version }}" >> $GITHUB_OUTPUT
           echo "openfoam-etc=/opt/openfoam${{ inputs.openfoam-version }}/etc" >> "$GITHUB_OUTPUT"
         else
-          sudo cp $GITHUB_ACTION_PATH/pubkey.gpg /etc/apt/trusted.gpg.d/openfoam.asc
-          sudo bash -c "echo \"deb [arch=$(dpkg --print-architecture)] https://dl.openfoam.com/repos/deb $(sed -ne 's/^VERSION_CODENAME=//p' /etc/os-release) main\" > /etc/apt/sources.list.d/openfoam.list"
-          echo "apt-packages=openfoam${{ inputs.openfoam-version }}-default" >> $GITHUB_OUTPUT
+          sudo cp $GITHUB_ACTION_PATH/pubkey.gpg /etc/apt/trusted.gpg.d/openfoam-com.asc
+          sudo bash -c "echo \"deb [arch=$(dpkg --print-architecture)] https://dl.openfoam.com/repos/deb $(sed -ne 's/^VERSION_CODENAME=//p' /etc/os-release) main\" > /etc/apt/sources.list.d/openfoam-com.list"
+          echo "apt-package=openfoam${{ inputs.openfoam-version }}-default" >> $GITHUB_OUTPUT
           echo "openfoam-etc=/usr/lib/openfoam/openfoam${{ inputs.openfoam-version }}/etc" >> "$GITHUB_OUTPUT"
         fi
       shell: bash
     - name: Install OpenFOAM on Linux
-      if: steps.prep.outputs.apt-packages
+      if: steps.prep.outputs.apt-package
       uses: gerlero/apt-install@v1
       with:
-        packages: ${{ steps.prep.outputs.apt-packages }}
+        packages: ${{ steps.prep.outputs.apt-package }}
         install-recommends: false
         cache: ${{ inputs.cache && inputs.cache != 'false' }}
     - name: Restore OpenFOAM on macOS from cache