fix install_common not running

Author: samfreund

.github/workflows/main.yml

@@ -76,7 +76,7 @@ jobs:
     - name: Install dependencies and build image
       run: |
           chmod +x mount.sh
-          ./mount.sh ${{ matrix.base_image }} ${{ matrix.script}} ./install_common.sh
+          ./mount.sh ${{ matrix.base_image }} ${{ matrix.script}} install_common.sh ${{ github.ref_name }} ${{ matrix.name }}
 
     - name: Compress built image
       run: |

install_common.sh

@@ -3,6 +3,9 @@
 # Verbose and exit on errors
 set -ex
 
+GITHUB_REF_NAME=$1
+MATRIX_NAME=$2
+
 # Do additional tasks that are common across all images, 
 # but not suitable for inclusion in install.sh
 echo "Running install_common.sh"
@@ -26,10 +29,10 @@ echo "photon:vision" | chpasswd
 
 # Add a helpful message to the logon screen
 # ASCII Art generated by: https://www.asciiart.eu/image-to-ascii
-cp -f ./files/issue.txt /etc/issue
+cp -f /tmp/build/files/issue.txt /etc/issue
 cp -f /etc/issue /etc/issue.net
 sed -i 's/#Banner none/Banner \/etc\/issue.net/g' /etc/ssh/sshd_config
 
 # Add photon version file
 mkdir -p /opt/photonvision/
-echo "${{ github.ref_name }};${{ matrix.name }}" > /opt/photonvision/image-version
+echo "${GITHUB_REF_NAME};${MATRIX_NAME}" > /opt/photonvision/image-version

mount.sh

@@ -226,11 +226,11 @@ sudo chroot rootfs /bin/bash -c "
   echo '=== Running ${scriptOne} ==='
   ./tmp/build/${scriptOne}
 
-  if [ -f "${scriptTwo}" ]; then
+  if [ -f "/tmp/build/${scriptTwo}" ]; then
     echo '=== Making second script executable ==='
     chmod +x /tmp/build/${scriptTwo}
     echo '=== Running ${scriptTwo} ==='
-    ./tmp/build/${scriptTwo}
+    ./tmp/build/${scriptTwo} $(printf '%q ' "${@:4}")
   else
     echo 'No second script provided, skipping.'
   fi