sync get_architecture() function

to match the change in rust-lang/rustup#48
brson · Mar 18, 2016 · 69d8d47 · 69d8d47
1 parent 4662bb8
commit 69d8d47
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 4 deletions.
diff --git a/blastoff.sh b/blastoff.sh
@@ -102,11 +102,16 @@ get_architecture() {
             local _cputype=arm
             ;;
 
-        armv7l)
+        armv6l)
             local _cputype=arm
             local _ostype="${_ostype}eabihf"
             ;;
 
+        armv7l)
+            local _cputype=armv7
+            local _ostype="${_ostype}eabihf"
+            ;;
+
         x86_64 | x86-64 | x64 | amd64)
             local _cputype=x86_64
             ;;

diff --git a/quick-install.sh b/quick-install.sh
@@ -102,11 +102,16 @@ get_architecture() {
             local _cputype=arm
             ;;
 
-        armv7l)
+        armv6l)
             local _cputype=arm
             local _ostype="${_ostype}eabihf"
             ;;
 
+        armv7l)
+            local _cputype=armv7
+            local _ostype="${_ostype}eabihf"
+            ;;
+
         x86_64 | x86-64 | x64 | amd64)
             local _cputype=x86_64
             ;;

diff --git a/test-v1.sh b/test-v1.sh
@@ -286,11 +286,16 @@ get_architecture() {
             local _cputype=arm
         ;;
 
-        armv7l)
+        armv6l)
             local _cputype=arm
             local _ostype="${_ostype}eabihf"
         ;;
 
+        armv7l)
+            local _cputype=armv7
+            local _ostype="${_ostype}eabihf"
+        ;;
+
         x86_64 | x86-64 | x64 | amd64)
             local _cputype=x86_64
         ;;

diff --git a/test-v2.sh b/test-v2.sh
@@ -289,11 +289,16 @@ get_architecture() {
             local _cputype=arm
         ;;
 
-        armv7l)
+        armv6l)
             local _cputype=arm
             local _ostype="${_ostype}eabihf"
         ;;
 
+        armv7l)
+            local _cputype=armv7
+            local _ostype="${_ostype}eabihf"
+        ;;
+
         x86_64 | x86-64 | x64 | amd64)
             local _cputype=x86_64
         ;;