<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -6,6 +6,12 @@ TO DO A ONE COMMAND INSTALL - cap panda:install
 
 Please follow the commands in this order:
 
+Author
+Red Davis (http://redwriteshere.com)
+
+Contributors
+Edward Ocampo-Gooding (http://github.com/edward)
+
 cap panda:....
 
   apt_get_update</diff>
      <filename>Readme</filename>
    </modified>
    <modified>
      <diff>@@ -1,15 +1,22 @@
 namespace :panda do
   
-  # Fuck me! needs condensing to sections ;)
+  # TODO break out into smaller sections
   desc &quot;Install FFMPEG&quot;
   task :install_ffmpeg do
-    [&quot;wget http://downloads.sourceforge.net/lame/lame-398.tar.gz?modtime=1215212728&amp;big_mirror=0&quot;,
+    [&quot;rm lame-398.tar.gz&quot;,
+     &quot;rm -rf lame-398&quot;,
+     &quot;wget http://downloads.sourceforge.net/lame/lame-398.tar.gz?modtime=1215212728&amp;big_mirror=0&quot;,
      &quot;sudo tar -xf lame-398.tar.gz&quot;,
      &quot;cd lame-398 &amp;&amp; ./configure &amp;&amp; make &amp;&amp; sudo make install&quot;,
-     &quot;sudo aptitude install build-essential git-core zlib1g-dev checkinstall libgpac-dev libfaad-dev libfaac-dev liblame-dev libtheora-dev libvorbis-dev gpac subversion&quot;,
-     &quot;wget http://www.tortall.net/projects/yasm/releases/yasm-0.7.1.tar.gz&quot;, # Make video encoding faster
+     &quot;sudo aptitude install build-essential git-core zlib1g-dev checkinstall libgpac-dev libfaad-dev libfaac-dev liblame-dev libtheora-dev libvorbis-dev gpac subversion -y&quot;,
+     
+     # Make video encoding faster
+     &quot;rm yasm-0.7.1.tar.gz&quot;,
+     &quot;rm -rf yasm-0.7.1&quot;,
+     &quot;wget http://www.tortall.net/projects/yasm/releases/yasm-0.7.1.tar.gz&quot;,
      &quot;tar xzvf yasm-0.7.1.tar.gz&quot;,
      &quot;cd yasm-0.7.1 &amp;&amp; ./configure &amp;&amp; make &amp;&amp; sudo make install&quot;,
+     
      &quot;sudo rm -rf x264&quot;,
      &quot;git clone git://git.videolan.org/x264.git&quot;,
      &quot;cd x264 &amp;&amp; ./configure --enable-pthread --enable-mp4-output --enable-shared &amp;&amp; sudo make &amp;&amp; sudo make install&quot;,
@@ -17,10 +24,7 @@ namespace :panda do
      &quot;sudo rm -rf ffmpeg&quot;,
      &quot;sudo svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg&quot;,
      &quot;cd ffmpeg &amp;&amp; ./configure --enable-gpl --enable-postproc --enable-libvorbis --enable-libtheora --disable-debug --enable-libmp3lame --enable-libfaad --enable-libfaac --enable-pthreads --enable-libx264 &amp;&amp; make &amp;&amp; sudo make install&quot;
-   ].each {|cmd| run cmd do |ch, stream, out|
-                puts out
-                ch.send_data(input = $stdin.gets) if out =~ /\[Y\/n\]\?|\[y\]|continue:/
-              end}
+   ].each {|cmd| run cmd}
   end
   
 end
\ No newline at end of file</diff>
      <filename>ffmpeg.rb</filename>
    </modified>
    <modified>
      <diff>@@ -3,22 +3,24 @@ namespace :panda do
   desc &quot;Install nginx&quot;
   task :install_nginx do
     [&quot;sudo aptitude install libpcre3 libpcre3-dev libpcrecpp0 libssl-dev zlib1g-dev&quot;,
-      &quot;rm -r nginx-upload-progress-module&quot;,
-      &quot;git clone git://github.com/masterzen/nginx-upload-progress-module.git&quot;,
-      &quot;wget http://sysoev.ru/nginx/nginx-0.6.32.tar.gz&quot;,
-      &quot;tar -zxvf nginx-0.6.32.tar.gz&quot;,
-      &quot;cd nginx-0.6.32 &amp;&amp; ./configure --sbin-path=/usr/local/sbin --with-http_ssl_module --add-module=../nginx-upload-progress-module/ &amp;&amp; make &amp;&amp; sudo make install&quot;
+      &quot;rm -rf nginx-upload-progress-module&quot;,
+       &quot;git clone git://github.com/masterzen/nginx-upload-progress-module.git&quot;,
+       &quot;rm -f nginx-0.6.32.tar.gz&quot;,
+       &quot;wget http://sysoev.ru/nginx/nginx-0.6.32.tar.gz&quot;,
+       &quot;rm -rf nginx-0.6.32&quot;,
+       &quot;tar -zxvf nginx-0.6.32.tar.gz&quot;,
+       &quot;cd nginx-0.6.32 &amp;&amp; ./configure --sbin-path=/usr/local/sbin --with-http_ssl_module --add-module=../nginx-upload-progress-module/ &amp;&amp; make &amp;&amp; sudo make install&quot;
       ].each {|cmd| run cmd}
   end
   
   desc &quot;Start nginx&quot;
   task :start_nginx do
-    sudo &quot;sudo /usr/local/sbin/nginx&quot;
+    sudo &quot;/usr/local/sbin/nginx&quot;
   end
   
   desc &quot;Stop nginx&quot;
   task :stop_nginx do
-    sudo &quot;sudo kill `cat /usr/local/nginx/logs/nginx.pid`&quot;
+    sudo &quot;kill `cat /usr/local/nginx/logs/nginx.pid`&quot;
   end
   
 end
\ No newline at end of file</diff>
      <filename>nginx.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,9 +2,9 @@ namespace :panda do
   
   desc &quot;Install RVideo&quot;
   task :rvideo do
-    [&quot;sudo rm -rf rvideo&quot;,
-     &quot;git clone git://github.com/jaikoo/rvideo.git&quot;,
-     &quot;cd rvideo &amp;&amp; rake install_gem &amp;&amp; sudo cp lib/rvideo/tools/*.rb  /usr/lib/ruby/gems/1.8/gems/rvideo-0.9.4/lib/rvideo/tools/&quot;].each {|cmd| run cmd}
+     [&quot;rm -rf rvideo&quot;,
+       &quot;git clone git://github.com/jaikoo/rvideo.git&quot;,
+       &quot;cd rvideo &amp;&amp; rake install_gem &amp;&amp; cp lib/rvideo/tools/*.rb  /usr/lib/ruby/gems/1.8/gems/rvideo-0.9.4/lib/rvideo/tools/&quot;].each {|cmd| sudo cmd}
   end
   
 end
\ No newline at end of file</diff>
      <filename>rvideo.rb</filename>
    </modified>
    <modified>
      <diff>@@ -12,17 +12,28 @@ namespace :panda do
       &quot;cd zlib-1.2.3 &amp;&amp; ./configure --prefix=/usr/local/zlib &amp;&amp; sudo make &amp;&amp; sudo make install&quot;].each {|cmd| run cmd}
    end
    
-   # For some reason it was being a pain in the arse, so...
-   desc &quot;Install all required files&quot;
-   task :install_required_files do
-     [&quot;wget http://fr.archive.ubuntu.com/ubuntu/pool/multiverse/g/gpac/libgpac-dev_0.4.4-0.3ubuntu1_amd64.deb&quot;,
-      &quot;sudo dpkg -i libgpac-dev_0.4.4-0.3ubuntu1_amd64.deb&quot;,
-      #&quot;wget http://fr.archive.ubuntu.com/ubuntu/pool/multiverse/f/faac/libfaac-dev_1.26-0.1ubuntu1_amd64.deb&quot;,
-      #&quot;sudo dpkg -i libfaac-dev_1.26-0.1ubuntu1_amd64.deb&quot;
-      &quot;wget http://fr.archive.ubuntu.com/ubuntu/pool/multiverse/f/faac/libfaac0_1.26-0.1ubuntu1_amd64.deb&quot;,
-      &quot;sudo dpkg -i libfaac0_1.26-0.1ubuntu1_amd64.deb&quot;,
-      &quot;sudo apt-get install flvtool2&quot;
-      ].each {|cmd| run cmd}
-   end
+   #desc &quot;Install all required files&quot;
+   #task :install_all_required_files do
+  #   [&quot;wget http://fr.archive.ubuntu.com/ubuntu/pool/multiverse/g/gpac/libgpac-dev_0.4.4-0.3ubuntu1_amd64.deb&quot;,
+  #    &quot;sudo dpkg -i libgpac-dev_0.4.4-0.3ubuntu1_amd64.deb&quot;,
+  #    &quot;wget http://fr.archive.ubuntu.com/ubuntu/pool/multiverse/f/faac/libfaac-dev_1.26-0.1ubuntu1_amd64.deb&quot;,
+  #    &quot;sudo dpkg -i libfaac-dev_1.26-0.1ubuntu1_amd64.deb&quot;,
+  #    &quot;wget http://fr.archive.ubuntu.com/ubuntu/pool/multiverse/f/faac/libfaac0_1.26-0.1ubuntu1_amd64.deb&quot;,
+  #    &quot;sudo dpkg -i libfaac0_1.26-0.1ubuntu1_amd64.deb&quot;,
+  #    &quot;sudo apt-get install flvtool2&quot;
+  #    ].each {|cmd| run cmd}
+  # end
+
+   # Uncomment this section when using a 32-bit instance
+   # TODO - Check uname output and switch appropriately
+    desc &quot;Install all required files&quot;
+    task :install_all_required_files do
+      [&quot;wget http://fr.archive.ubuntu.com/ubuntu/pool/multiverse/g/gpac/libgpac-dev_0.4.4-0.3ubuntu1_i386.deb&quot;,
+       &quot;sudo dpkg -i libgpac-dev_0.4.4-0.3ubuntu1_i386.deb&quot;,
+       &quot;wget http://fr.archive.ubuntu.com/ubuntu/pool/multiverse/f/faac/libfaac0_1.26-0.1ubuntu1_i386.deb&quot;,
+       &quot;sudo dpkg -i libfaac0_1.26-0.1ubuntu1_i386.deb&quot;,
+       &quot;sudo apt-get install flvtool2&quot;
+       ].each {|cmd| run cmd}
+    end
    
 end
\ No newline at end of file</diff>
      <filename>system.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>d9c5c386137f6f31942e9eddea720f798fe53a75</id>
    </parent>
  </parents>
  <author>
    <name>Red Davis</name>
    <email>reddavis@gmail.com</email>
  </author>
  <url>http://github.com/reddavis/panda_cap/commit/a46edd46151444b8e7b3aacd2ef65ed24c6ab17a</url>
  <id>a46edd46151444b8e7b3aacd2ef65ed24c6ab17a</id>
  <committed-date>2008-11-27T03:05:38-08:00</committed-date>
  <authored-date>2008-11-27T03:05:38-08:00</authored-date>
  <message>add edwards changes</message>
  <tree>37eaa86ec9c356acd9535216540e539566fc84ec</tree>
  <committer>
    <name>Red Davis</name>
    <email>reddavis@gmail.com</email>
  </committer>
</commit>
