Skip to content

Commit

Permalink
fix runstart with electron path,add some error handling
Browse files Browse the repository at this point in the history
  • Loading branch information
sdetweil committed Feb 2, 2020
1 parent 1bb2c07 commit 6edadf5
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 13 deletions.
9 changes: 8 additions & 1 deletion raspberry.sh
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,7 @@ if [ $mac != 'Darwin' ]; then
upgrade=$true
fi
if [ $upgrade -eq $true ]; then
echo "apt-get upgrade started" >> $logfile
upgrade_result=$(sudo apt-get --assume-yes upgrade 2>&1)
upgrade_rc=$?
echo apt upgrade result ="rc=$upgrade_rc $upgrade_result" >> $logfile
Expand Down Expand Up @@ -281,6 +282,8 @@ if [ $doInstall == 1 ]; then
echo -e "\e[96mCloning MagicMirror ...\e[90m" | tee -a $logfile
if git clone --depth=1 https://github.com/MichMich/MagicMirror.git; then
echo -e "\e[92mCloning MagicMirror Done!\e[0m" | tee -a $logfile
# replace faulty run-start.sh
curl -sL https://raw.githubusercontent.com/sdetweil/MagicMirror_scripts/master/run-start.sh >MagicMirror/run-start.sh
else
echo -e "\e[91mUnable to clone MagicMirror." | tee -a $logfile
exit;
Expand All @@ -299,7 +302,11 @@ if [ $doInstall == 1 ]; then
echo -e "\e[91mUnable to install dependencies!" | tee -a $logfile
exit;
fi

# fixup permissions on sandbox file if it exists
if [ -f node_modules/electron/dist/chrome-sandbox ]; then
sudo chmod 4755 node_modules/electron/dist/chrome-sandbox 2>/dev/null
sudo chown root node_modules/electron/dist/chrome-sandbox 2>/dev/null
fi
# Use sample config for start MagicMirror
echo setting up initial config.js | tee -a $logfile
cp config/config.js.sample config/config.js
Expand Down
2 changes: 1 addition & 1 deletion run-start.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,6 @@ else
fi
else
# we can use electron directly
electron js/electron.js $1;
node_modules/.bin/electron js/electron.js $1;
fi
fi
24 changes: 13 additions & 11 deletions screensaveroff.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ mac=$(uname -s)
fi
;;
gsd-screensaver | gsd-screensaver-proxy)
setting=$(gsettings get org.gnome.desktop.screensaver lock-enabled)
setting1=$(gsettings get org.gnome.desktop.session idle-delay)
setting=$(gsettings get org.gnome.desktop.screensaver lock-enabled 2>/dev/null)
setting1=$(gsettings get org.gnome.desktop.session idle-delay 2>/dev/null)
if [ "$setting $setting1" != 'false uint32 0' ]; then
echo disable screensaver via gsettings was $setting and $setting1>> $logfile
gsettings set org.gnome.desktop.screensaver lock-enabled false
Expand All @@ -64,15 +64,17 @@ mac=$(uname -s)
esac
fi
if [ $(which gsettings | wc -l) == 1 ]; then
setting=$(gsettings get org.gnome.desktop.screensaver lock-enabled)
setting1=$(gsettings get org.gnome.desktop.session idle-delay)
if [ "$setting $setting1" != 'false uint32 0' ]; then
echo disable screensaver via gsettings was $setting and $setting1>> $logfile
gsettings set org.gnome.desktop.screensaver lock-enabled false
gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
gsettings set org.gnome.desktop.session idle-delay 0
else
echo gsettings screen saver already disabled >> $logfile
setting=$(gsettings get org.gnome.desktop.screensaver lock-enabled 2>/dev/null)
setting1=$(gsettings get org.gnome.desktop.session idle-delay 2>/dev/null)
if [ "$setting. $setting1." != '. .' ]; then
if [ "$setting. $setting1" != 'false uint32 0' ]; then
echo disable screensaver via gsettings was $setting and $setting1>> $logfile
gsettings set org.gnome.desktop.screensaver lock-enabled false
gsettings set org.gnome.desktop.screensaver idle-activation-enabled false
gsettings set org.gnome.desktop.session idle-delay 0
else
echo gsettings screen saver already disabled >> $logfile
fi
fi
fi
if [ -e "/etc/lightdm/lightdm.conf" ]; then
Expand Down

0 comments on commit 6edadf5

Please sign in to comment.