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

updates for libc6++ on pi 0, node 10

Browse Source
This commit is contained in:
Sam Detweiler 2019-11-21 22:32:48 -06:00
parent cb7ccd7854
commit 7d7ec1a00b
3 changed files with 107 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
installers/fixuppm2.sh
View File

@ -1,6 +1,6 @@
#!/bin/bash #!/bin/bash
# Define the tested version of Node.js. # Define the tested version of Node.js.
NODE_TESTED="v5.1.0" NODE_TESTED="v10.1.0"
NPM_TESTED="V6.0.0" NPM_TESTED="V6.0.0"
USER=`whoami` USER=`whoami`
PM2_FILE=pm2_MagicMirror.json PM2_FILE=pm2_MagicMirror.json
@ -22,7 +22,14 @@ if [ -d ~/MagicMirror ]; then
cd - >/dev/null cd - >/dev/null
fi fi
logfile=$logdir/pm2_setup.log logfile=$logdir/pm2_setup.log
echo the log will be saved in $logfile
date +"pm2 setup starting - %a %b %e %H:%M:%S %Z %Y" >>$logfile date +"pm2 setup starting - %a %b %e %H:%M:%S %Z %Y" >>$logfile
echo system is $(uname -a) >> $logfile
if [ "$mac" == "Darwin" ]; then
echo the os is macOS $(sw_vers -productVersion) >> $logfile
else
echo the os is $(lsb_release -a) >> $logfile
fi
node_installed=$(which node) node_installed=$(which node)
if [ "$node_installed." == "." ]; then if [ "$node_installed." == "." ]; then
# node not installed # node not installed
@ -105,11 +112,24 @@ if [ -d ~/MagicMirror ]; then
fi fi
fi fi
fi fi
echo command = $v >>$logfile echo startup command = $v >>$logfile
# execute the command returned # execute the command returned
$v 2>/dev/null >>$logfile $v 2>&1 >>$logfile
echo pm2 startup done >>$logfile echo pm2 startup command done >>$logfile
# is this is mac
# need to fix pm2 startup, only on catalina
if [ $mac == 'Darwin' -a $(sw_vers -productVersion | head -c 6) == '10.15.' ]; then
# only do if the faulty tag is present (pm2 may fix this, before the script is fixed)
if [ $(grep -m 1 UserName /Users/$USER/Library/LaunchAgents/pm2.$USER.plist | wc -l) -eq 1 ]; then
# copy the pm2 startup file config
cp /Users/$USER/Library/LaunchAgents/pm2.$USER.plist .
# edit out the UserName key/value strings
sed -e '/UserName/{N;d;}' pm2.$USER.plist > pm2.$USER.plist.new
# copy the file back
sudo cp pm2.$USER.plist.new /Users/$USER/Library/LaunchAgents/pm2.$USER.plist
fi
fi
# if the user is no pi, we have to fixup the pm2 json file # if the user is no pi, we have to fixup the pm2 json file
echo configure the pm2 config file for MagicMirror >>$logfile echo configure the pm2 config file for MagicMirror >>$logfile
if [ "$USER" != "pi" ]; then if [ "$USER" != "pi" ]; then

78
installers/raspberry.sh
View File

@ -21,7 +21,7 @@ doInstall=1
true=1 true=1
false=0 false=0
# Define the tested version of Node.js. # Define the tested version of Node.js.
NODE_TESTED="v5.1.0" NODE_TESTED="v10.1.0"
NPM_TESTED="V6.0.0" NPM_TESTED="V6.0.0"
USER=`whoami` USER=`whoami`
PM2_FILE=pm2_MagicMirror.json PM2_FILE=pm2_MagicMirror.json
@ -67,6 +67,7 @@ echo install log being saved to $logfile
date +"install starting - %a %b %e %H:%M:%S %Z %Y" >>$logfile date +"install starting - %a %b %e %H:%M:%S %Z %Y" >>$logfile
ARM=$(uname -m) ARM=$(uname -m)
echo installing on $ARM processor system >>$logfile echo installing on $ARM processor system >>$logfile
echo the os is $(lsb_release -a) >> $logfile
# Check the Raspberry Pi version. # Check the Raspberry Pi version.
if [ "$ARM" != "armv7l" ]; then if [ "$ARM" != "armv7l" ]; then
read -p "this appears not to be a Raspberry Pi 2 or 3, do you want to continue installation (y/N)?" choice read -p "this appears not to be a Raspberry Pi 2 or 3, do you want to continue installation (y/N)?" choice
@ -80,7 +81,7 @@ if [ "$ARM" != "armv7l" ]; then
#if [ "$ARM" == "armv6l" ]; then #if [ "$ARM" == "armv6l" ]; then
# echo forcing armv71 architecture for pi 0 >>$logfile # echo forcing armv71 architecture for pi 0 >>$logfile
# force_arch=-'--arch=armv7l' # force_arch=-'--arch=armv7l'
#fi # fi
fi fi
# Define helper methods. # Define helper methods.
@ -106,6 +107,10 @@ NODE_INSTALL=false
if command_exists node; then if command_exists node; then
echo -e "\e[0mNode currently installed. Checking version number." | tee -a $logfile echo -e "\e[0mNode currently installed. Checking version number." | tee -a $logfile
NODE_CURRENT=$(node -v) NODE_CURRENT=$(node -v)
if [ "$NODE_CURRENT." == "." ]; then
NODE_CURRENT="V1.0.0"
echo forcing low Node version >> $logfile
fi
echo -e "\e[0mMinimum Node version: \e[1m$NODE_TESTED\e[0m" | tee -a $logfile echo -e "\e[0mMinimum Node version: \e[1m$NODE_TESTED\e[0m" | tee -a $logfile
echo -e "\e[0mInstalled Node version: \e[1m$NODE_CURRENT\e[0m" | tee -a $logfile echo -e "\e[0mInstalled Node version: \e[1m$NODE_CURRENT\e[0m" | tee -a $logfile
if verlte $NODE_CURRENT $NODE_TESTED; then if verlte $NODE_CURRENT $NODE_TESTED; then
@ -128,7 +133,6 @@ else
echo -e "\e[93mNode.js is not installed.\e[0m" | tee -a $logfile echo -e "\e[93mNode.js is not installed.\e[0m" | tee -a $logfile
NODE_INSTALL=true NODE_INSTALL=true
fi fi
# Install or upgrade node if necessary. # Install or upgrade node if necessary.
if $NODE_INSTALL; then if $NODE_INSTALL; then
@ -140,13 +144,39 @@ if $NODE_INSTALL; then
if [ $mac == 'Darwin' ]; then if [ $mac == 'Darwin' ]; then
brew install node brew install node
else else
NODE_STABLE_BRANCH="10.x" NODE_STABLE_BRANCH="10.x"
curl -sL https://deb.nodesource.com/setup_$NODE_STABLE_BRANCH | sudo -E bash - # sudo apt-get install --only-upgrade libstdc++6
sudo apt-get install -y nodejs node_info=$(curl -sL https://deb.nodesource.com/setup_$NODE_STABLE_BRANCH | sudo -E bash - )
echo Node release info = $node_info >> $logfile
if [ "$(echo $node_info | grep "not currently supported")." == "." ]; then
sudo apt-get install -y nodejs
else
echo node $NODE_STABLE_BRANCH version installer not available, doing manually >>$logfile
# no longer supported install
sudo apt-get install -y --only-upgrade libstdc++6 >> $logfile
# have to do it manually
node_vnum=$(echo $NODE_STABLE_BRANCH | awk -F. '{print $1}')
# get the highest release number in the stable branch line for this processor architecture
node_ver=$(curl -sL https://unofficial-builds.nodejs.org/download/release/index.tab | grep $ARM | grep -m 1 v$node_vnum | awk '{print $1}')
echo latest release in the $NODE_STABLE_BRANCH family for $ARM is $node_ver >> $logfile
curl -sL https://unofficial-builds.nodejs.org/download/release/$node_ver/node-$node_ver-linux-$ARM.tar.gz >node_release-$node_ver.tar.gz
cd /usr/local
echo using release tar file = node_release-$node_ver.tar.gz >> $logfile
sudo tar --strip-components 1 -xzf $HOME/node_release-$node_ver.tar.gz
cd - >/dev/null
rm ./node_release-$node_ver.tar.gz
fi
# get the new node version number
new_ver=$(node -v 2>&1)
# if there is a failure to get it due to a missing library
if [ $(echo $new_ver | grep "not found" | wc -l) -ne 0 ]; then
#
sudo apt-get install -y --only-upgrade libstdc++6 >> $logfile
fi
echo node version is $(node -v 2>&1 >>$logfile)
fi fi
echo -e "\e[92mNode.js installation Done! version=$(node -v)\e[0m" | tee -a $logfile echo -e "\e[92mNode.js installation Done! version=$(node -v)\e[0m" | tee -a $logfile
fi fi
# Check if we need to install or upgrade npm. # Check if we need to install or upgrade npm.
echo -e "\e[96mCheck current NPM installation ...\e[0m" | tee -a $logfile echo -e "\e[96mCheck current NPM installation ...\e[0m" | tee -a $logfile
NPM_INSTALL=false NPM_INSTALL=false
@ -206,7 +236,7 @@ if [ $doInstall == 1 ]; then
echo -e "To prevent overwriting, the installer will be aborted." | tee -a $logfile echo -e "To prevent overwriting, the installer will be aborted." | tee -a $logfile
echo -e "Please rename the \e[1m~/MagicMirror\e[0m\e[93m folder and try again.\e[0m" | tee -a $logfile echo -e "Please rename the \e[1m~/MagicMirror\e[0m\e[93m folder and try again.\e[0m" | tee -a $logfile
echo "" echo ""
echo -e "If you want to upgrade your installation run \e[1m\e[97mgit pull\e[0m from the ~/MagicMirror directory." | tee -a $logfile echo -e "If you want to upgrade your installation run \e[1m\e[97mupgrade-script\e[0m from the ~/MagicMirror/installers directory." | tee -a $logfile
echo "" echo ""
exit; exit;
fi fi
@ -220,6 +250,11 @@ if [ $doInstall == 1 ]; then
fi fi
cd ~/MagicMirror || exit cd ~/MagicMirror || exit
if [ $(grep version package.json | awk -F: '{print $2}') == '"2.9.0",' -a $ARM == 'armv6l' ]; then
git fetch https://github.com/MichMich/MagicMirror.git develop >/dev/null 2>&1
git branch develop FETCH_HEAD > /dev/null 2>&1
git checkout develop > /dev/null 2>&1
fi
echo -e "\e[96mInstalling dependencies ...\e[90m" | tee -a $logfile echo -e "\e[96mInstalling dependencies ...\e[90m" | tee -a $logfile
if npm install $force_arch; then if npm install $force_arch; then
echo -e "\e[92mDependencies installation Done!\e[0m" | tee -a $logfile echo -e "\e[92mDependencies installation Done!\e[0m" | tee -a $logfile
@ -244,11 +279,13 @@ if command_exists plymouth; then
fi fi
if sudo cp ~/MagicMirror/splashscreen/splash.png $THEME_DIR/MagicMirror/splash.png && sudo cp ~/MagicMirror/splashscreen/MagicMirror.plymouth $THEME_DIR/MagicMirror/MagicMirror.plymouth && sudo cp ~/MagicMirror/splashscreen/MagicMirror.script $THEME_DIR/MagicMirror/MagicMirror.script; then if sudo cp ~/MagicMirror/splashscreen/splash.png $THEME_DIR/MagicMirror/splash.png && sudo cp ~/MagicMirror/splashscreen/MagicMirror.plymouth $THEME_DIR/MagicMirror/MagicMirror.plymouth && sudo cp ~/MagicMirror/splashscreen/MagicMirror.script $THEME_DIR/MagicMirror/MagicMirror.script; then
echo -e "\e[90mSplashscreen: Theme copied successfully.\e[0m" | tee -a $logfile echo
if sudo plymouth-set-default-theme -R MagicMirror; then if [ "$(which plymouth-set-default-theme)." != "." ]; then
echo -e "\e[92mSplashscreen: Changed theme to MagicMirror successfully.\e[0m" | tee -a $logfile if sudo plymouth-set-default-theme -R MagicMirror; then
else echo -e "\e[92mSplashscreen: Changed theme to MagicMirror successfully.\e[0m" | tee -a $logfile
echo -e "\e[91mSplashscreen: Couldn't change theme to MagicMirror!\e[0m" | tee -a $logfile else
echo -e "\e[91mSplashscreen: Couldn't change theme to MagicMirror!\e[0m" | tee -a $logfile
fi
fi fi
else else
echo -e "\e[91mSplashscreen: Copying theme failed!\e[0m" | tee -a $logfile echo -e "\e[91mSplashscreen: Copying theme failed!\e[0m" | tee -a $logfile
@ -292,7 +329,7 @@ if [[ $choice =~ ^[Yy]$ ]]; then
if [ "$pm2_installed." == "." ]; then if [ "$pm2_installed." == "." ]; then
# install it. # install it.
echo pm2 not installed, installing >>$logfile echo pm2 not installed, installing >>$logfile
result=$(sudo npm install $up -g pm2) result=$(npm install $up -g pm2)
echo pm2 install result $result >>$logfile echo pm2 install result $result >>$logfile
# if this is a mac # if this is a mac
if [ $mac == 'Darwin' ]; then if [ $mac == 'Darwin' ]; then
@ -322,6 +359,19 @@ if [[ $choice =~ ^[Yy]$ ]]; then
# execute the command returned # execute the command returned
$v 2>&1 >>$logfile $v 2>&1 >>$logfile
echo pm2 startup command done >>$logfile echo pm2 startup command done >>$logfile
# is this is mac
# need to fix pm2 startup, only on catalina
if [ $mac == 'Darwin' -a $(sw_vers -productVersion | head -c 6) == '10.15.' ]; then
# only do if the faulty tag is present (pm2 may fix this, before the script is fixed)
if [ $(grep -m 1 UserName /Users/$USER/Library/LaunchAgents/pm2.$USER.plist | wc -l) -eq 1 ]; then
# copy the pm2 startup file config
cp /Users/$USER/Library/LaunchAgents/pm2.$USER.plist .
# edit out the UserName key/value strings
sed -e '/UserName/{N;d;}' pm2.$USER.plist > pm2.$USER.plist.new
# copy the file back
sudo cp pm2.$USER.plist.new /Users/$USER/Library/LaunchAgents/pm2.$USER.plist
fi
fi
# if the user is no pi, we have to fixup the pm2 json file # if the user is no pi, we have to fixup the pm2 json file
echo configure the pm2 config file for MagicMirror >>$logfile echo configure the pm2 config file for MagicMirror >>$logfile

32
installers/upgrade-script.sh
View File

@ -44,10 +44,11 @@ if [ -d ~/MagicMirror ]; then
cd - >/dev/null cd - >/dev/null
fi fi
logfile=$logdir/upgrade.log logfile=$logdir/upgrade.log
echo the log will be $logfile
echo >>$logfile echo >>$logfile
date +"Upgrade started - %a %b %e %H:%M:%S %Z %Y" >>$logfile date +"Upgrade started - %a %b %e %H:%M:%S %Z %Y" >>$logfile
echo system is $(uname -a) >> $logfile
echo the os is $(lsb_release -a) >> $logfile
# because of how its executed from the web, p0 gets overlayed with parm # because of how its executed from the web, p0 gets overlayed with parm
# check to see if a parm was passed .. easy apply without editing # check to see if a parm was passed .. easy apply without editing
@ -79,10 +80,10 @@ if [ -d ~/MagicMirror ]; then
# if we want just the modules listed in config.js now # if we want just the modules listed in config.js now
if [ $justActive == $true ]; then if [ $justActive == $true ]; then
if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then if [ ! -f ~/MagicMirror/installers/dumpactivemodules.js ]; then
echo downloading dumpactivemodules script >> $logfile echo downloading dumpactivemodules script >> $logfile
curl -sL https://raw.githubusercontent.com/MichMich/MagicMirror/develop/installers/dumpactivemodules.js > ~/MagicMirror/installers/dumpactivemodules.js curl -sL https://www.dropbox.com/s/wwe6bfg2lcjmj43/dumpactivemodules.js?dl=0 > ~/MagicMirror/installers/dumpactivemodules.js
fi fi
fi fi
echo update log will be in $logfile echo update log will be in $logfile
# used for parsing the array of module names # used for parsing the array of module names
@ -151,13 +152,16 @@ if [ -d ~/MagicMirror ]; then
# get the latest upgrade # get the latest upgrade
echo fetching latest revisions | tee -a $logfile echo fetching latest revisions | tee -a $logfile
git fetch $remote >/dev/null
if git fetch $remote; then rc=$?
echo git fetch rc=$rc >>$logfile
if [ $rc -eq 0 ]; then
# need to get the current branch # need to get the current branch
current_branch=$(git branch | grep "*" | awk '{print $2}') current_branch=$(git branch | grep "*" | awk '{print $2}')
echo current branch = $current_branch >>$logfile echo current branch = $current_branch >>$logfile
$(git status 2>&1)>>$logfile
git status 2>&1 >>$logfile
# get the names of the files that are different locally # get the names of the files that are different locally
diffs=$(git status 2>&1 | grep modified | awk -F: '{print $2}') diffs=$(git status 2>&1 | grep modified | awk -F: '{print $2}')
@ -238,11 +242,11 @@ if [ -d ~/MagicMirror ]; then
if [ $doinstalls == $true ]; then if [ $doinstalls == $true ]; then
# if this is a pi zero # if this is a pi zero
echo processor architecture is $arch >> $logfile echo processor architecture is $arch >> $logfile
#if [ "$arch" == "armv6l" ]; then if [ "$arch" == "armv6l" ]; then
# # force to look like pi 2 # force to look like pi 2
# echo forcing architecture armv7l >>$logfile echo forcing architecture armv7l >>$logfile
# forced_arch='--arch=armv7l' forced_arch='--arch=armv7l'
#fi fi
echo "updating MagicMirror runtime, please wait" | tee -a $logfile echo "updating MagicMirror runtime, please wait" | tee -a $logfile
npm install $forced_arch 2>&1 | tee -a $logfile npm install $forced_arch 2>&1 | tee -a $logfile
done_update=`date +"completed - %a %b %e %H:%M:%S %Z %Y"` done_update=`date +"completed - %a %b %e %H:%M:%S %Z %Y"`