? includes.sh
Index: install-quickstart.sh
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quickstart/install-quickstart.sh,v
retrieving revision 1.7
diff -u -p -r1.7 install-quickstart.sh
--- install-quickstart.sh	17 Aug 2010 23:52:01 -0000	1.7
+++ install-quickstart.sh	5 Sep 2010 10:53:07 -0000
@@ -10,8 +10,13 @@
 # cvs -z6 -d:pserver:anonymous:anonymous@cvs.drupal.org:/cvs/drupal-contrib checkout -d quickstart contributions/modules/quickstart
 # bash ~/quickstart/install-quickstart.sh
 
-cd ~
+source ~/quickstart/includes.sh
+
+# Enable/disable install questions
+ask 'Use Quickstart default options?'
+export QSDEFAULTS=$yes
 
+cd ~
 bash -x ~/quickstart/quickstart-1-prep.sh
 bash -x ~/quickstart/quickstart-2-slim.sh
 bash -x ~/quickstart/quickstart-3-lamp.sh
@@ -20,5 +25,7 @@ bash -x ~/quickstart/quickstart-5-browse
 bash -x ~/quickstart/quickstart-6-devenv.sh
 bash -x ~/quickstart/quickstart-7-config.sh
 bash -x ~/quickstart/export-prep.sh
-firefox ~/quickstart/quickstart-8-manualconfig.txt
 
+zenity --text-info --title='Manual steps' --width=600 --height=500 --filename ~/quickstart/quickstart-8-manualconfig.txt
+
+unset QSDEFAULTS
Index: quickstart-2-slim.sh
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quickstart/quickstart-2-slim.sh,v
retrieving revision 1.6
diff -u -p -r1.6 quickstart-2-slim.sh
--- quickstart-2-slim.sh	1 Aug 2010 03:42:21 -0000	1.6
+++ quickstart-2-slim.sh	5 Sep 2010 10:53:08 -0000
@@ -1,9 +1,13 @@
 #!/bin/bash
+source ~/quickstart/includes.sh
 
 # See also http://benhodge.wordpress.com/2008/02/17/cleaning-up-a-ubuntu-gnulinux-system/
 
 # FIXME means there may be more space to save.
 
+defaultyes 'Do you want to slim this Ubuntu installation? This will remove almost all packages not necessary for development.'
+if [ $yes ]; then #continue
+
 # Use aptitude here because it does a better job removing packages
 sudo aptitude -y install deborphan # Package to find orphan packages
 # 351mb - Open office
@@ -144,3 +148,5 @@ df -h -T > ~/quickstart/quickstart-size-
 #   sudo aptitude install ubuntu-desktop ubuntu-standard 
 #   sudo aptitude install xserver-xorg-input-all xserver-xorg-video-all nvidia-common
 #   sudo aptitude install ubuntu-restricted-extras
+
+fi #end slim
Index: quickstart-4-ides.sh
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quickstart/quickstart-4-ides.sh,v
retrieving revision 1.6
diff -u -p -r1.6 quickstart-4-ides.sh
--- quickstart-4-ides.sh	31 Aug 2010 00:11:05 -0000	1.6
+++ quickstart-4-ides.sh	5 Sep 2010 10:53:08 -0000
@@ -1,4 +1,8 @@
 #!/bin/bash
+source ~/quickstart/includes.sh
+
+defaultyes 'Install Netbeans IDE?'
+if [ $yes ]; then #continue
 
 # Install java - 100mb
 sudo apt-get -y install default-jre
@@ -14,15 +18,42 @@ bash ./netbeans.sh
 rm netbeans.sh
 cd ~
 
+fi #end netbeans install
+
+defaultyes 'Install Eclipse IDE?'
+if [ $yes ]; then #continue
+
+# Install java - 100mb (required by eclipse?)
+sudo apt-get -y install default-jre
 # Download and install eclipse - About 341 mb
 sudo add-apt-repository ppa:yogarine/eclipse/ubuntu && sudo apt-get update
 sudo DEBIAN_FRONTEND=noninteractive aptitude -yq install eclipse eclipse-pdt eclipse-plugin-cvs eclipse-subclipse
 
+fi #end eclipse install
+
+defaultyes 'Install GIMP graphics editor?'
+if [ $yes ]; then #continue
+
 # Install graphics editors - weights about 54mb
 sudo apt-get -y install gimp
 
+fi #end gimp install
+
+defaultno 'Install Inkscape vector graphics editor?'
+if [ $yes ]; then #continue
+
+# Install inkscape
+sudo apt-get -y install inkscape
+
+fi #end inkscape install
+
+defaultyes 'Install RabbitVCS graphical version control?'
+if [ $yes ]; then #continue
+
 # Install graphical version control - weighs about 83mb
 sudo add-apt-repository ppa:rabbitvcs/ppa && sudo apt-get update
 sudo apt-get -y install rabbitvcs-nautilus
 sudo killall nautilus
 
+fi #end rabbitvcs install
+
Index: quickstart-5-browsers.sh
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quickstart/quickstart-5-browsers.sh,v
retrieving revision 1.3
diff -u -p -r1.3 quickstart-5-browsers.sh
--- quickstart-5-browsers.sh	31 Aug 2010 00:11:05 -0000	1.3
+++ quickstart-5-browsers.sh	5 Sep 2010 10:53:08 -0000
@@ -1,4 +1,5 @@
 #!/bin/bash
+source ~/quickstart/includes.sh
 
 # See here for list of browsers and rendering engines http://en.wikipedia.org/wiki/List_of_web_browsers
 
@@ -15,7 +16,12 @@ firefox -P temp
 zenity --info --text="Firefox profile manager will start.\n1) Delete temp profile.\n2) THEN CLOSE FIREFOX."
 firefox -ProfileManager
 
+defaultyes 'Install Chromium browser?'
+if [ $yes ]; then #continue
+
 # Install chrome browser (Webkit (fork of KHTML/Konquerer).  Used by Safari)
 sudo apt-get -y install chromium-browser flashplugin-nonfree
 sudo ln -s /usr/lib/flashplugin-installer/libflashplayer.so /usr/lib/chromium-browser/plugins/
 
+fi #end chromium install
+
Index: quickstart-6-devenv.sh
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quickstart/quickstart-6-devenv.sh,v
retrieving revision 1.13
diff -u -p -r1.13 quickstart-6-devenv.sh
--- quickstart-6-devenv.sh	31 Aug 2010 00:11:05 -0000	1.13
+++ quickstart-6-devenv.sh	5 Sep 2010 10:53:09 -0000
@@ -1,4 +1,5 @@
 #!/bin/bash
+source ~/quickstart/includes.sh
 
 cd ~
 
@@ -218,6 +219,8 @@ xdebug.profiler_output_dir=/home/quickst
 " | sudo tee /etc/php5/conf.d/xdebug.ini > /dev/null
 
 
+defaultyes 'Install Webgrind, an Xdebug profiling frontend?'
+if [ $yes ]; then #continue
 
 # ################################################################################ Install a web-based profile viewer
 cd ~/quickstart/websites/logs/profiler
@@ -240,12 +243,15 @@ echo "<VirtualHost *:80>
 	</Directory>
 </VirtualHost>" | sudo tee /etc/apache2/sites-enabled/000-default
 
+fi #end webgrind install
 
+defaultyes 'Install Apache SOLR search platform?'
+if [ $yes ]; then #continue
 
 # ################################################################################ Apache SOLR - 183mb
-
 sudo apt-get -y install solr-common solr-tomcat
 
+fi #end Apache SOLR install
 
 
 # ################################################################################ Restart apache
@@ -253,8 +259,11 @@ echo "quickstart ALL=NOPASSWD: /usr/sbin
 sudo apache2ctl restart
 
 
+defaultyes 'Set up example website example.dev?'
+if [ $yes ]; then #continue
 
 # ################################################################################ Make example.dev
 cd ~/websites
 drush quickstart-create all --domain=example.dev
 
+fi #end set up example.dev
Index: quickstart-7-config.sh
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quickstart/quickstart-7-config.sh,v
retrieving revision 1.3
diff -u -p -r1.3 quickstart-7-config.sh
--- quickstart-7-config.sh	17 Aug 2010 22:37:03 -0000	1.3
+++ quickstart-7-config.sh	5 Sep 2010 10:53:09 -0000
@@ -1,9 +1,16 @@
 #!/bin/bash
+source ~/quickstart/includes.sh
+
+defaultyes 'Change default Ubuntu theme?'
+if [ $yes ]; then #continue
 
 # Change default theme
 gconftool-2 -s /apps/metacity/general/theme --type=string Radiance
 gconftool-2 -s /desktop/gnome/interface/gtk_theme --type=string Radiance
 gconftool-2 -s /desktop/gnome/interface/icon_theme --type=string ubuntu-mono-light
+
+fi #end change theme
+
 # Config gedit-2
 gconftool-2 -s /apps/gedit-2/preferences/editor/auto_indent/auto_indent --type=bool true
 gconftool-2 -s /apps/gedit-2/preferences/editor/bracket_matching/bracket_matching --type=bool true
@@ -16,6 +23,10 @@ gconftool-2 -s /apps/gedit-2/preferences
 gconftool-2 -s /apps/gedit-2/preferences/editor/save/auto_save --type=bool true
 # gnome terminal
 gconftool-2 -s /apps/gnome-terminal/profiles/Default/scrollback_unlimited --type=bool true
+
+defaultyes 'Enable Ubuntu automatic updates?'
+if [ $yes ]; then #continue
+
 # automatic updates.  apply security.  download updates
 echo "
 APT::Periodic::Enable \"1\";
@@ -24,5 +35,8 @@ APT::Periodic::Download-Upgradeable-Pack
 APT::Periodic::AutocleanInterval \"5\";
 APT::Periodic::Unattended-Upgrade \"1\";
 " | sudo tee /etc/apt/apt.conf.d/10periodic
+
+fi #end enable automatic updates
+
 # setup icons on top of screen
 gconftool-2 --load ~/quickstart/config/my-panel-setup.entries