From e95023e8cc1d82f103ed6f090f3ad84ac4d1f35e Mon Sep 17 00:00:00 2001
From: Sam Detweiler <sdetweil@gmail.com>
Date: Thu, 24 Oct 2019 22:13:46 -0500
Subject: [PATCH] remove forced arch parm for armv6 to armv7, doesn't work

---
 installers/raspberry.sh      |  8 ++++----
 installers/upgrade-script.sh | 22 +++++++++++-----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/installers/raspberry.sh b/installers/raspberry.sh
index 72c935e6..88dd5580 100755
--- a/installers/raspberry.sh
+++ b/installers/raspberry.sh
@@ -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.
diff --git a/installers/upgrade-script.sh b/installers/upgrade-script.sh
index 5d9bace6..9dd5d76f 100755
--- a/installers/upgrade-script.sh
+++ b/installers/upgrade-script.sh
@@ -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"`