Fix arch setup typos

Use `uname -m` instead of `arch`, there is no such command in later Debian versions.
r-hub · Dec 17, 2023 · 3488ada · 3488ada
1 parent ba05c28
commit 3488ada
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/containers/Dockerfile-lenny b/containers/Dockerfile-lenny
@@ -33,7 +33,7 @@ COPY cran.txt /tmp/cran.txt
 COPY set-cran.sh /tmp/set-cran.sh
 RUN R_VERSION=${R_VERSION} /tmp/set-cran.sh
 
-COPY etch-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY lenny-entrypoint.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 
 CMD [ "R" ]
diff --git a/containers/Dockerfile-squeeze b/containers/Dockerfile-squeeze
@@ -33,7 +33,7 @@ COPY cran.txt /tmp/cran.txt
 COPY set-cran.sh /tmp/set-cran.sh
 RUN R_VERSION=${R_VERSION} /tmp/set-cran.sh
 
-COPY etch-entrypoint.sh /usr/local/bin/entrypoint.sh
+COPY squeeze-entrypoint.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT [ "/usr/local/bin/entrypoint.sh" ]
 
 CMD [ "R" ]
diff --git a/containers/lenny-entrypoint.sh b/containers/lenny-entrypoint.sh
@@ -4,7 +4,7 @@
 # We need linux32 for an x86_64 host where `arch` returns `x86_64`, but
 # we cannot use it on an arm64 host, because it fails currently.
 
-if [ "`arch`" = "x86_64" ]; then
+if [ "`uname -m`" = "x86_64" ]; then
     exec linux32 ${1+"$@"}
 else
     exec ${1+"$@"}

diff --git a/containers/squeeze-entrypoint.sh b/containers/squeeze-entrypoint.sh
@@ -4,7 +4,7 @@
 # We need linux32 for an x86_64 host where `arch` returns `x86_64`, but
 # we cannot use it on an arm64 host, because it fails currently.
 
-if [ "`arch`" = "x86_64" ]; then
+if [ "`uname -m`" = "x86_64" ]; then
     exec linux32 ${1+"$@"}
 else
     exec ${1+"$@"}

diff --git a/containers/wheezy-entrypoint.sh b/containers/wheezy-entrypoint.sh
@@ -4,7 +4,7 @@
 # We need linux32 for an x86_64 host where `arch` returns `x86_64`, but
 # we cannot use it on an arm64 host, because it fails currently.
 
-if [ "`arch`" = "x86_64" ]; then
+if [ "`uname -m`" = "x86_64" ]; then
     exec linux32 ${1+"$@"}
 else
     exec ${1+"$@"}