Select arm downloads for aarch #72

This commit is contained in:
Bob Mottram 2017-09-18 15:27:11 +01:00
parent 9117ee7118
commit 2e99116062
4 changed files with 6 additions and 6 deletions

View File

@ -408,13 +408,13 @@ function mesh_install_ipfs_go {
if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
IPFS_ARCH=amd64 IPFS_ARCH=amd64
fi fi
if [[ $ARCHITECTURE == *"arm"* ]]; then if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
IPFS_ARCH=arm IPFS_ARCH=arm
fi fi
if [ ! $IPFS_ARCH ]; then if [ ! $IPFS_ARCH ]; then
echo $'No architecture specified' echo $'No architecture specified'
ARCHITECTURE=$(uname -m) ARCHITECTURE=$(uname -m)
if [[ $ARCHITECTURE == "arm"* ]]; then if [[ $ARCHITECTURE == "arm"* || $ARCHITECTURE == *"aarch"* ]]; then
IPFS_ARCH=arm IPFS_ARCH=arm
echo $"Using $IPFS_ARCH" echo $"Using $IPFS_ARCH"
fi fi

View File

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

View File

@ -144,13 +144,13 @@ function mesh_upgrade_golang {
if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then if [[ $ARCHITECTURE == *"amd64" || $ARCHITECTURE == "x86_64" ]]; then
GOARCH=amd64 GOARCH=amd64
fi fi
if [[ $ARCHITECTURE == *"arm"* ]]; then if [[ $ARCHITECTURE == *"arm"* || $ARCHITECTURE == *"aarch"* ]]; then
GOARCH=armv6l GOARCH=armv6l
fi fi
if [ ! $GOARCH ]; then if [ ! $GOARCH ]; then
echo $'No architecture specified' echo $'No architecture specified'
ARCHITECTURE=$(uname -m) ARCHITECTURE=$(uname -m)
if [[ $ARCHITECTURE == "arm"* ]]; then if [[ $ARCHITECTURE == "arm"* || $ARCHITECTURE == *"aarch"* ]]; then
GOARCH=armv6l GOARCH=armv6l
echo $"Using $GOARCH" echo $"Using $GOARCH"
fi fi

View File

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