diff --git a/plugins/python-build/share/python-build/anaconda-1.4.0 b/plugins/python-build/share/python-build/anaconda-1.4.0
index 481a1553..e2e5d7b0 100644
--- a/plugins/python-build/share/python-build/anaconda-1.4.0
+++ b/plugins/python-build/share/python-build/anaconda-1.4.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo ": Precompiled binary of anaconda-1.4.0 is not available for $(uname -s)-$(uname -m)."
+    echo ": Precompiled binary of anaconda-1.4.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.5.0 b/plugins/python-build/share/python-build/anaconda-1.5.0
index 2caab2bf..c474a8e3 100644
--- a/plugins/python-build/share/python-build/anaconda-1.5.0
+++ b/plugins/python-build/share/python-build/anaconda-1.5.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.5.0 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of anaconda-1.5.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.5.1 b/plugins/python-build/share/python-build/anaconda-1.5.1
index eddb45c8..67af4bb5 100644
--- a/plugins/python-build/share/python-build/anaconda-1.5.1
+++ b/plugins/python-build/share/python-build/anaconda-1.5.1
@@ -5,7 +5,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.5.1 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of anaconda-1.5.1 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.6.0 b/plugins/python-build/share/python-build/anaconda-1.6.0
index 05c700e5..fb61eec1 100644
--- a/plugins/python-build/share/python-build/anaconda-1.6.0
+++ b/plugins/python-build/share/python-build/anaconda-1.6.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.6.0 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of anaconda-1.6.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.6.1 b/plugins/python-build/share/python-build/anaconda-1.6.1
index d9a25404..d71bf980 100644
--- a/plugins/python-build/share/python-build/anaconda-1.6.1
+++ b/plugins/python-build/share/python-build/anaconda-1.6.1
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.6.1 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of anaconda-1.6.1 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.7.0 b/plugins/python-build/share/python-build/anaconda-1.7.0
index 149dc5f4..baa939a2 100644
--- a/plugins/python-build/share/python-build/anaconda-1.7.0
+++ b/plugins/python-build/share/python-build/anaconda-1.7.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.7.0 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of anaconda-1.7.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.8.0 b/plugins/python-build/share/python-build/anaconda-1.8.0
index 243146b7..bbe66a61 100644
--- a/plugins/python-build/share/python-build/anaconda-1.8.0
+++ b/plugins/python-build/share/python-build/anaconda-1.8.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.8.0 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of anaconda-1.8.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.9.0 b/plugins/python-build/share/python-build/anaconda-1.9.0
index 3d52f9da..6482e452 100644
--- a/plugins/python-build/share/python-build/anaconda-1.9.0
+++ b/plugins/python-build/share/python-build/anaconda-1.9.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.9.0 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of anaconda-1.9.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/anaconda-1.9.1 b/plugins/python-build/share/python-build/anaconda-1.9.1
index c5dc9bb0..8def91e3 100644
--- a/plugins/python-build/share/python-build/anaconda-1.9.1
+++ b/plugins/python-build/share/python-build/anaconda-1.9.1
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of anaconda-1.9.1 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of anaconda-1.9.1 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda-2.2.2 b/plugins/python-build/share/python-build/miniconda-2.2.2
index 386081f3..343acab3 100644
--- a/plugins/python-build/share/python-build/miniconda-2.2.2
+++ b/plugins/python-build/share/python-build/miniconda-2.2.2
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda-2.2.2 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of miniconda-2.2.2 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda-3.0.0 b/plugins/python-build/share/python-build/miniconda-3.0.0
index 79d30ad9..b61cb655 100644
--- a/plugins/python-build/share/python-build/miniconda-3.0.0
+++ b/plugins/python-build/share/python-build/miniconda-3.0.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda-3.0.0 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of miniconda-3.0.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda-3.0.4 b/plugins/python-build/share/python-build/miniconda-3.0.4
index 0a2de051..13ee01b8 100644
--- a/plugins/python-build/share/python-build/miniconda-3.0.4
+++ b/plugins/python-build/share/python-build/miniconda-3.0.4
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda-3.0.4 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of miniconda-3.0.4 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda-3.0.5 b/plugins/python-build/share/python-build/miniconda-3.0.5
index 7dcbd946..8f4667af 100644
--- a/plugins/python-build/share/python-build/miniconda-3.0.5
+++ b/plugins/python-build/share/python-build/miniconda-3.0.5
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda-3.0.5 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of miniconda-3.0.5 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda3-2.2.2 b/plugins/python-build/share/python-build/miniconda3-2.2.2
index fc05bb45..e4a75246 100644
--- a/plugins/python-build/share/python-build/miniconda3-2.2.2
+++ b/plugins/python-build/share/python-build/miniconda3-2.2.2
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda3-2.2.2 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of miniconda3-2.2.2 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda3-3.0.0 b/plugins/python-build/share/python-build/miniconda3-3.0.0
index 6158c001..30b62f09 100644
--- a/plugins/python-build/share/python-build/miniconda3-3.0.0
+++ b/plugins/python-build/share/python-build/miniconda3-3.0.0
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda3-3.0.0 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of miniconda3-3.0.0 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda3-3.0.4 b/plugins/python-build/share/python-build/miniconda3-3.0.4
index 3b4a24bb..4ccadc10 100644
--- a/plugins/python-build/share/python-build/miniconda3-3.0.4
+++ b/plugins/python-build/share/python-build/miniconda3-3.0.4
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda3-3.0.4 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of miniconda3-3.0.4 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1
diff --git a/plugins/python-build/share/python-build/miniconda3-3.0.5 b/plugins/python-build/share/python-build/miniconda3-3.0.5
index 51e31ee7..eebf8d07 100644
--- a/plugins/python-build/share/python-build/miniconda3-3.0.5
+++ b/plugins/python-build/share/python-build/miniconda3-3.0.5
@@ -11,7 +11,7 @@ case "$(anaconda_architecture 2>/dev/null || true)" in
 * )
   { echo
     colorize 1 "ERROR"
-    echo "Precompiled binary of miniconda3-3.0.5 is not available for $(uname -s)-$(uname -m)."
+    echo "Precompiled binary of miniconda3-3.0.5 is not available for $(anaconda_architecture 2>/dev/null || true)."
     echo
   } >&2
   exit 1