Make pr_diff file available

Author: ocaisa

EESSI-install-software.sh

@@ -242,6 +242,11 @@ fi
 # order is important: these are needed to install a full CUDA SDK in host_injections
 # for now, this just reinstalls all scripts. Note the most elegant, but works
 
+# the install_scripts.sh script relies on knowing the location of the PR diff
+# assume there's only one diff file that corresponds to the PR patch file
+pr_diff=$(ls [0-9]*.diff | head -1)
+export PR_DIFF="$PWD/$pr_diff"
+
 # Only run install_scripts.sh if not in dev.eessi.io for security
 if [[ -z ${EESSI_DEV_PROJECT} ]]; then
     ${TOPDIR}/install_scripts.sh --prefix ${EESSI_PREFIX}
@@ -341,10 +346,6 @@ else
     echo_green ">> MODULEPATH set up: ${MODULEPATH}"
 fi
 
-# assume there's only one diff file that corresponds to the PR patch file
-pr_diff=$(ls [0-9]*.diff | head -1)
-
-
 # use PR patch file to determine in which easystack files stuff was added
 changed_easystacks=$(cat ${pr_diff} | grep '^+++' | cut -f2 -d' ' | sed 's@^[a-z]/@@g' | grep 'easystacks/.*yml$' | egrep -v 'known-issues|missing') 
 if [ -z "${changed_easystacks}" ]; then

install_scripts.sh

@@ -15,7 +15,7 @@ file_changed_in_pr() {
   # Make sure file exists
   [[ -f "$full_path" ]] || return 1
 
-  # Check if the file is in a Git repo
+  # Check if the file is in a Git repo (it should be) 
   local repo_root
   repo_root=$(git -C "$(dirname "$full_path")" rev-parse --show-toplevel 2>/dev/null)
   if [[ -z "$repo_root" ]]; then
@@ -26,10 +26,14 @@ file_changed_in_pr() {
   local rel_path
   rel_path=$(realpath --relative-to="$repo_root" "$full_path")
 
-  # Check if the file changed in the diff range
+  # Check if the file changed in the PR diff file that we have
   (
     cd "$repo_root" || return 2
-    git diff --name-only "$base_branch"...HEAD | grep -q "^$rel_path$"
+    if [ -f "$PR_DIFF" ]; then  # PR_DIFF should be set by the calling script
+      grep -q "b/$rel_path" "$pr_diff" # Add b/ to match diff patterns
+    else
+      return 3
+    fi
   ) && return 0 || return 1
 }
 
@@ -51,8 +55,9 @@ compare_and_copy() {
           echo "File $source_file copied to $destination_file"
         else
           case $? in
-            1) echo "❌ File has NOT changed" ;;
-            2) echo "🚫 Not in a Git repo" ;;
+            1) echo "❌ File has NOT changed in PR" ;;
+            2) echo "🚫 Not in Git repository" ;;
+            3) echo "🚫 No PR diff file found" ;;
             *) echo "⚠️ Unknown error" ;;
           esac
         fi