Merge pull request #23 from mdmintz/linux-improvements

Linux improvements

Author: mdmintz

integrations/google_cloud/ReadMe.md

@@ -48,7 +48,6 @@ bash
 ```bash
 ./Linuxfile.sh
 ```
-(If a message appears during installation asking you to configure "Keyboard layout", you can hit the "Enter" key to accept the default setting, which is "English (US)".)
 
 #### 9. Start up the headless browser display mechanism (Xvfb)
 

integrations/linux/Linuxfile.sh

@@ -1,7 +1,7 @@
 # SeleniumBase Debian Linux Dependency Installation
 # (Installs all required dependencies on Linux)
 
-# Make sure this is only run on Linux
+# Make sure this script is only run on Linux
 value="$(uname)"
 if [ $value == "Linux" ]
 then
@@ -11,42 +11,51 @@ else
   exit
 fi
 
+# Go home
+cd ~
+
 # Configure apt-get resources
 sudo sh -c "echo \"deb http://packages.linuxmint.com debian import\" >> /etc/apt/sources.list"
 sudo sh -c "echo \"deb http://downloads.sourceforge.net/project/ubuntuzilla/mozilla/apt all main\" >> /etc/apt/sources.list"
 
-# Install Xvfb (headless display system) and other dependencies
-cd ~
+# Update aptitude
 sudo aptitude update
-sudo aptitude install -y xvfb
-sudo aptitude install -y x11-xkb-utils
-sudo aptitude install -y xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic
-sudo aptitude install -y xserver-xorg-core
+
+# Install core dependencies
+sudo aptitude install -y --force-yes xserver-xorg-core
+sudo aptitude install -y --force-yes x11-xkb-utils
+
+# Install Xvfb (headless display system)
+sudo aptitude install -y --force-yes xvfb
+
+# Install fonts for web browsers
+sudo aptitude install -y --force-yes xfonts-100dpi xfonts-75dpi xfonts-scalable xfonts-cyrillic
+
+# Install Python core dependencies
+sudo apt-get update
+sudo apt-get install -y --force-yes python-setuptools
 
 # Install Firefox
 sudo gpg --keyserver pgp.mit.edu --recv-keys 3EE67F3D0FF405B2
 sudo gpg --export 3EE67F3D0FF405B2 > 3EE67F3D0FF405B2.gpg
 sudo apt-key add ./3EE67F3D0FF405B2.gpg
 sudo rm ./3EE67F3D0FF405B2.gpg
-sudo apt-get update
-sudo apt-get install -y python-setuptools
-sudo apt-get -qy --no-install-recommends install -y firefox
-sudo apt-get -qy --no-install-recommends install -y $(apt-cache depends firefox | grep Depends | sed "s/.*ends:\ //" | tr '\n' ' ')
+sudo apt-get -qy --no-install-recommends install -y --force-yes firefox
+sudo apt-get -qy --no-install-recommends install -y --force-yes $(apt-cache depends firefox | grep Depends | sed "s/.*ends:\ //" | tr '\n' ' ')
 cd /tmp
 sudo wget --no-check-certificate -O firefox-esr.tar.bz2 'https://download.mozilla.org/?product=firefox-esr-latest&os=linux32&lang=en-US'
 sudo tar -xjf firefox-esr.tar.bz2 -C /opt/
 sudo rm -rf /usr/bin/firefox
 sudo ln -s /opt/firefox/firefox /usr/bin/firefox
 sudo rm -f /tmp/firefox-esr.tar.bz2
-sudo apt-get -f install -y firefox
+sudo apt-get -f install -y --force-yes firefox
 
 # Install more dependencies
 sudo apt-get update
-sudo apt-get install -y xvfb
-sudo apt-get install -y build-essential chrpath libssl-dev libxft-dev
-sudo apt-get install -y libfreetype6 libfreetype6-dev
-sudo apt-get install -y libfontconfig1 libfontconfig1-dev
-sudo apt-get install -y unzip
+sudo apt-get install -y --force-yes xvfb
+sudo apt-get install -y --force-yes build-essential chrpath libssl-dev libxft-dev
+sudo apt-get install -y --force-yes libfreetype6 libfreetype6-dev
+sudo apt-get install -y --force-yes libfontconfig1 libfontconfig1-dev
 
 # Install PhantomJS
 cd ~
@@ -59,7 +68,7 @@ sudo ln -sf /usr/local/share/$PHANTOM_JS/bin/phantomjs /usr/local/bin
 # Install Chrome
 cd /tmp
 sudo wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-sudo apt-get -f install -y
+sudo apt-get -f install -y --force-yes
 sudo dpkg -i google-chrome-stable_current_amd64.deb
 
 # Install Chromedriver
@@ -73,6 +82,8 @@ sudo mv -f ~/Downloads/chromedriver /usr/local/share/chromedriver
 sudo ln -s /usr/local/share/chromedriver /usr/local/bin/chromedriver
 sudo ln -s /usr/local/share/chromedriver /usr/bin/chromedriver
 
-# Other Dependencies
-sudo apt-get -f install -y
+# Finalize apt-get dependancies
+sudo apt-get -f install -y --force-yes
+
+# Get pip
 sudo easy_install pip