Merge pull request #27 from nmfs-opensci/eeholmes-patch-1

try rocker_scripts at /
nmfs-opensci · Oct 8, 2024 · 4f12268 · 4f12268
2 parents c4bdda9 + 743e43a
commit 4f12268
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/rocker.sh b/rocker.sh
@@ -11,8 +11,8 @@ R_VERSION="4.4.1"
 cd ${REPO_DIR}
 wget https://github.com/rocker-org/rocker-versioned2/archive/refs/tags/R${R_VERSION}.tar.gz
 tar zxvf R${R_VERSION}.tar.gz && \
-mv rocker-versioned2-R${R_VERSION}/scripts rocker_scripts && \
-mv rocker-versioned2-R${R_VERSION}/dockerfiles/verse_${R_VERSION}.Dockerfile rocker_scripts/verse_${R_VERSION}.Dockerfile && \
+mv rocker-versioned2-R${R_VERSION}/scripts /rocker_scripts && \
+mv rocker-versioned2-R${R_VERSION}/dockerfiles/verse_${R_VERSION}.Dockerfile /rocker_scripts/verse_${R_VERSION}.Dockerfile && \
 rm R${R_VERSION}.tar.gz && \
 rm -rf rocker-versioned2-R${R_VERSION}
 
@@ -27,6 +27,6 @@ while IFS= read -r line; do
         cmd=$(echo "$line" | sed 's/^RUN //g')
         full_cmd="${REPO_DIR}${cmd}"
         echo "Executing: $full_cmd"
-        eval "$full_cmd"
+        eval "$cmd"
     fi
 done < rocker_scripts/verse_${R_VERSION}.Dockerfile