kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-06-27 19:53:36 +00:00
Code Issues Projects Releases Wiki Activity

remove forced arch parm for armv6 to armv7, doesn't work

Browse Source
This commit is contained in:
Sam Detweiler 2019-10-24 22:13:46 -05:00
parent 9c98fea8f4
commit e95023e8cc
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
installers/raspberry.sh
View File

@ -77,10 +77,10 @@ if [ "$ARM" != "armv7l" ]; then
echo -e "\e[91mIf this is a Pi Zero, you are in the same boat as the original Raspberry Pi. You must run in server only mode."
exit;
fi
if [ "$ARM" == "armv6l" ]; then
echo forcing armv71 architecture for pi 0 >>$logfile
force_arch=-'--arch=armv7l'
fi
#if [ "$ARM" == "armv6l" ]; then
# echo forcing armv71 architecture for pi 0 >>$logfile
# force_arch=-'--arch=armv7l'
#fi
fi
# Define helper methods.

22
installers/upgrade-script.sh
View File

@ -78,12 +78,12 @@ if [ -d ~/MagicMirror ]; then
fi
# if we want just the modules listed in config.js now
if [ $justActive == $true ]; then
if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then
echo downloading dumpactivemodules script >> $logfile
curl -sL https://www.dropbox.com/s/wwe6bfg2lcjmj43/dumpactivemodules.js?dl=0 > ~/MagicMirror/installers/dumpactivemodules.js
fi
fi
#if [ $justActive == $true ]; then
# if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then
# echo downloading dumpactivemodules script >> $logfile
# curl -sL https://www.dropbox.com/s/wwe6bfg2lcjmj43/dumpactivemodules.js?dl=0 > ~/MagicMirror/installers/dumpactivemodules.js
# fi
#fi
echo update log will be in $logfile
# used for parsing the array of module names
SAVEIFS=$IFS # Save current IFS
@ -238,11 +238,11 @@ if [ -d ~/MagicMirror ]; then
if [ $doinstalls == $true ]; then
# if this is a pi zero
echo processor architecture is $arch >> $logfile
if [ "$arch" == "armv6l" ]; then
# force to look like pi 2
echo forcing architecture armv7l >>$logfile
forced_arch='--arch=armv7l'
fi
#if [ "$arch" == "armv6l" ]; then
# # force to look like pi 2
# echo forcing architecture armv7l >>$logfile
# forced_arch='--arch=armv7l'
#fi
echo "updating MagicMirror runtime, please wait" | tee -a $logfile
npm install $forced_arch 2>&1 | tee -a $logfile
done_update=`date +"completed - %a %b %e %H:%M:%S %Z %Y"`