Explorar el Código

Select arm downloads for aarch #72

Bob Mottram hace 7 años
padre
commit
2e99116062

+ 2
- 2
src/freedombone-app-ipfs Ver fichero

@@ -408,13 +408,13 @@ function mesh_install_ipfs_go {
408 408
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
409 409
         IPFS_ARCH=amd64
410 410
     fi
411
-    if [[ $ARCHITECTURE == *"arm"* ]]; then
411
+    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
412 412
         IPFS_ARCH=arm
413 413
     fi
414 414
     if [ ! $IPFS_ARCH ]; then
415 415
         echo $'No architecture specified'
416 416
         ARCHITECTURE=$(uname -m)
417
-        if [[ $ARCHITECTURE == "arm"* ]]; then
417
+        if [[ $ARCHITECTURE == "arm"* || $ARCHITECTURE == *"aarch"* ]]; then
418 418
             IPFS_ARCH=arm
419 419
             echo $"Using $IPFS_ARCH"
420 420
         fi

+ 1
- 1
src/freedombone-image-customise Ver fichero

@@ -1164,7 +1164,7 @@ function image_setup_utils {
1164 1164
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
1165 1165
         GOARCH=amd64
1166 1166
     fi
1167
-    if [[ $ARCHITECTURE == *"arm"* ]]; then
1167
+    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
1168 1168
         GOARCH=armv6l
1169 1169
     fi
1170 1170
     if [ ! $GOARCH ]; then

+ 2
- 2
src/freedombone-utils-go Ver fichero

@@ -144,13 +144,13 @@ function mesh_upgrade_golang {
144 144
     if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
145 145
         GOARCH=amd64
146 146
     fi
147
-    if [[ $ARCHITECTURE == *"arm"* ]]; then
147
+    if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
148 148
         GOARCH=armv6l
149 149
     fi
150 150
     if [ ! $GOARCH ]; then
151 151
         echo $'No architecture specified'
152 152
         ARCHITECTURE=$(uname -m)
153
-        if [[ $ARCHITECTURE == "arm"* ]]; then
153
+        if [[ $ARCHITECTURE == "arm"* || $ARCHITECTURE == *"aarch"* ]]; then
154 154
             GOARCH=armv6l
155 155
             echo $"Using $GOARCH"
156 156
         fi

+ 1
- 1
src/freedombone-utils-nodejs Ver fichero

@@ -46,7 +46,7 @@ NODEJS_INSTALLED_APPS_FILE=$HOME/.nodejs-apps
46 46
 function get_npm_arch {
47 47
     N_ARCH='x86'
48 48
     NPM_ARCH='ia32'
49
-    if [[ $ARCHITECTURE == 'arm'* ]]; then
49
+    if [[ $ARCHITECTURE == 'arm'* || $ARCHITECTURE == *"aarch"* ]]; then
50 50
         NPM_ARCH='armv7l'
51 51
         N_ARCH='arm'
52 52
     fi