Merge lp:~joshbrown/codemonkey/x64_flash_installer into lp:~tom-swartz07/codemonkey/trunk

[Josh Brown]

Added a catch to end the program if wget fails.

[Tom Swartz (tom-swartz07)]

This was added in revision 37 of the file.
http://bazaar.launchpad.net/~tom-swartz07/codemonkey/trunk/revision/37

review: Abstain

[Josh Brown (joshbrown)]

Oops, looks like I got confused, sorry. I'll mark this as merged.

=== added file 'x64 Flash Installer'
--- x64 Flash Installer	1970-01-01 00:00:00 +0000
+++ x64 Flash Installer	2010-06-22 16:44:27 +0000
@@ -0,0 +1,51 @@
+#!/bin/sh
+#	Copyright (C) 2010  Thomas Swartz
+#
+#	This program is intended to install X64 version of Adobe Flash
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+if [ "`whoami`" != "root" ];
+then
+echo "Please run with SUDO"
+exit 1
+fi
+
+echo "Closing Browsers..."
+killall -9 firefox
+killall -9 google-chrome
+
+echo "Removing previous installs of Flash:"
+apt-get remove -y --purge flashplugin-nonfree gnash gnash-common mozilla-plugin-gnash swfdec-mozilla libflashsupport nspluginwrapper
+rm -f /usr/lib/mozilla/plugins/*flash*
+rm -f ~/.mozilla/plugins/*flash*
+rm -f /usr/lib/firefox/plugins/*flash*
+rm -f /usr/lib/firefox-addons/plugins/*flash*
+rm -f /usr/lib/chromium-browser/plugins/*flash*
+rm -rfd /usr/lib/nspluginwrapper
+
+echo "Installing Flash Player 10.0.45.2"
+cd ~
+wget http://download.macromedia.com/pub/labs/flashplayer10/libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz \
+	|| { echo 'Error: Cannot retrieve flash player.' >&2; exit 1; }
+tar zxvf libflashplayer-10.0.45.2.linux-x86_64.so.tar.gz
+mv libflashplayer.so /usr/lib/flashplugin-installer/
+mv libflashplayer.so /usr/lib/mozilla/plugins
+
+echo "Adding PPA for x64 Flash"
+add-apt-repository ppa:sevenmachines/flash
+apt-get update && apt-get install flashplugin64-installer
+
+echo "Done"
+echo "You may re-start your browser now"
 
=== renamed file 'x64 Flash Installer' => 'x64 Flash Installer.moved'