Skip to content

Commit

Permalink
Make chromium install optinal via switch, lets variant use diffrent b…
Browse files Browse the repository at this point in the history
…rowser
  • Loading branch information
guysoft committed Jul 3, 2016
1 parent 258d673 commit 6f47e51
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 2 deletions.
8 changes: 7 additions & 1 deletion src/chroot_script
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,13 @@ apt-get autoremove -y
#apt-get tools
apt-get -y --force-yes install python2.7 git screen checkinstall avahi-daemon libavahi-compat-libdnssd1 xterm

apt-get install -y --force-yes chromium-browser xdotool matchbox-window-manager xorg lightdm
if [ "$FULLPAGEOS_INCLUDE_CHROMIUM" == "yes" ]
then
apt-get install -y --force-yes chromium-browser
sudo -u pi sed -i 's@%BROWSER_START_SCRIPT%@/home/pi/scripts/start_chromium_browser@g' /home/pi/scripts/run_onepageos
fi

apt-get install -y --force-yes xdotool matchbox-window-manager xorg lightdm
apt-get install -y --force-yes vim x11vnc expect

#Install web stack
Expand Down
1 change: 1 addition & 0 deletions src/config
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ fi

[ -n "$FULLPAGEOS_OVERRIDE_HOSTNAME" ] || FULLPAGEOS_OVERRIDE_HOSTNAME=fullpageos

[ -n "$FULLPAGEOS_INCLUDE_CHROMIUM" ] || FULLPAGEOS_INCLUDE_CHROMIUM=yes

# FullPageDashboard repo & branch
[ -n "$FULLPAGEOS_DASHBOARD_REPO_SHIP" ] || FULLPAGEOS_DASHBOARD_REPO_SHIP=https://github.com/amitdar/FullPageDashboard.git
Expand Down
2 changes: 1 addition & 1 deletion src/filesystem/home/pi/scripts/run_onepageos
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ do
if [ $(curl -sL -w "%{http_code}\\n" "http://localhost/FullPageDashboard" -o /dev/null) == "200" ]; then
(sleep 15 ; /home/pi/scripts/fullscreen) &
xdotool mousemove 9000 9000
chromium-browser --kiosk --app=$(head -n 1 /boot/fullpageos.txt)
%BROWSER_START_SCRIPT%
fi
sleep 1
done
2 changes: 2 additions & 0 deletions src/filesystem/home/pi/scripts/start_chromium_browser
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#!/bin/bash
chromium-browser --kiosk --app=$(head -n 1 /boot/fullpageos.txt)

0 comments on commit 6f47e51

Please sign in to comment.