illucent · February 20, 2014 21:31 · Oct 22, 2012 · Oct 22, 2012 · Aug 28, 2012 · Aug 28, 2012
diff --git a/br3ker.sh b/br3ker.sh
@@ -66,6 +66,7 @@ ln -s /opt/google/talkplugin/libnpgtpo3dautoplugin.so /opt/google/chrome/pepper/
 
 rm /opt/talk.tar.gz
 
+## JAVA
 ## JAVA
 echo "Downloading Oracle Java"
 curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L $JAVA
@@ -75,12 +76,14 @@ mkdir -p /usr/lib/jvm/java-7-oracle/jre/
 tar -xvf /opt/java-bin.tar.gz -C /usr/lib/jvm/java-7-oracle/jre/ --strip-components 1
 rm /usr/lib/cromo/libnpjp2.so
 if [ `uname -m` == 'x86_64' ]; then
-  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/amd64/libnpjp2.so /usr/lib/cromo/libnpjp2.so
-  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/amd64/libnpjp2.so /usr/lib/mozilla/plugins/libnpjp2.so
+  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/amd64/libnpjp2.so /usr/lib64/cromo/libnpjp2.so
+  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/amd64/libnpjp2.so /usr/lib64/mozilla/plugins/libnpjp2.so
+  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/amd64/libnpjp2.so /usr/lib64/libnpjp2.so
   ln -s /usr/lib/jvm/java-7-oracle/jre/lib/amd64/libnpjp2.so /opt/google/chrome/libnpjp2.so
 else
   ln -s /usr/lib/jvm/java-7-oracle/jre/lib/i386/libnpjp2.so /usr/lib/cromo/libnpjp2.so
   ln -s /usr/lib/jvm/java-7-oracle/jre/lib/i386/libnpjp2.so /usr/lib/mozilla/plugins/libnpjp2.so
+  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/i386/libnpjp2.so /usr/lib/libnpjp2.so
   ln -s /usr/lib/jvm/java-7-oracle/jre/lib/i386/libnpjp2.so /opt/google/chrome/libnpjp2.so
 fi
 curl -L https://raw.github.com/gist/3065781/99java > /etc/env.d/99java

diff --git a/99java b/99java
@@ -1,4 +1,9 @@
 ## Setup java
 
-PATH="/usr/lib/jvm/java-7-oracle/jre/bin/"
-JAVA_HOME="/usr/lib/jvm/java-7-oracle/"
+if [ `uname -m` == 'x86_64' ]; then
+ PATH="/usr/lib64/jvm/java-7-oracle/jre/bin/"
+ JAVA_HOME="/usr/lib64/jvm/java-7-oracle/"
+else
+ PATH="/usr/lib/jvm/java-7-oracle/jre/bin/"
+ JAVA_HOME="/usr/lib/jvm/java-7-oracle/"
+fi
diff --git a/br3ker.sh b/br3ker.sh
@@ -21,6 +21,7 @@ rm "/opt/deb2tar.py"
 
 curl -o "/opt/deb2tar.py" "https://raw.github.com/gist/3065781/deb2tar.py"
 
+mkdir -p /usr/lib/mozilla/plugins/
 
 #Flash, pdf
 
@@ -36,6 +37,7 @@ tar -xvf /opt/chrome.tar.lzma -C chrome-unstable
 #mp3,mp4
 cp /opt/chrome-unstable/opt/google/chrome/libffmpegsumo.so /usr/lib/cromo/ -f
 cp /opt/chrome-unstable/opt/google/chrome/libffmpegsumo.so /opt/google/chrome/ -f
+cp /opt/chrome-unstable/opt/google/chrome/libffmpegsumo.so /usr/lib/mozilla/plugins/ -f
 
 #pdf
 cp /opt/chrome-unstable/opt/google/chrome/libpdf.so /opt/google/chrome/ -f
@@ -74,8 +76,12 @@ tar -xvf /opt/java-bin.tar.gz -C /usr/lib/jvm/java-7-oracle/jre/ --strip-compone
 rm /usr/lib/cromo/libnpjp2.so
 if [ `uname -m` == 'x86_64' ]; then
   ln -s /usr/lib/jvm/java-7-oracle/jre/lib/amd64/libnpjp2.so /usr/lib/cromo/libnpjp2.so
+  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/amd64/libnpjp2.so /usr/lib/mozilla/plugins/libnpjp2.so
+  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/amd64/libnpjp2.so /opt/google/chrome/libnpjp2.so
 else
   ln -s /usr/lib/jvm/java-7-oracle/jre/lib/i386/libnpjp2.so /usr/lib/cromo/libnpjp2.so
+  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/i386/libnpjp2.so /usr/lib/mozilla/plugins/libnpjp2.so
+  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/i386/libnpjp2.so /opt/google/chrome/libnpjp2.so
 fi
 curl -L https://raw.github.com/gist/3065781/99java > /etc/env.d/99java
 env-update

diff --git a/pepper-flash.info b/pepper-flash.info
@@ -6,7 +6,7 @@
 
 FILE_NAME=/opt/google/chrome/pepper/libpepflashplayer.so
 PLUGIN_NAME="Shockwave Flash"
-VERSION="11.3.31.208"
+VERSION="11.3.31.318"
 VISIBLE_VERSION="11.3 r31"
 DESCRIPTION="$PLUGIN_NAME $VISIBLE_VERSION"
 MIME_TYPES="application/x-shockwave-flash"
diff --git a/deb2tar.py b/deb2tar.py
@@ -60,28 +60,29 @@ def main(file_open, file_write):
     with open(file_open, 'r', 1024 * 1024) as in_file:
         for (pointer, line) in enumerate(in_file):
             zacetek += len(line)
-            if line.find('data.tar') > -1:
-		konec = int(shlex.split(line)[5])
-                file_name = str(shlex.split(line)[0])
+            if 'data.tar' in line:
+                meta = shlex.split(line[line.find('data.tar'):len(line)])
+                konec = int(meta[5])
+                file_name = str(meta[0])
                 break
 
     statinfo = os.stat(file_open)
-    print 'start block', zacetek
-    print 'end block', konec
-    print 'end deb', statinfo.st_size
-    print 'diff', statinfo.st_size - konec
-    if konec < 100:
-        konec = statinfo.st_size-1
-    if zacetek and konec:
-        print 'Filename is ' + file_name
+    if statinfo.st_size - konec == zacetek:
         copypart(file_open, file_write, int(zacetek), int(konec) + int(zacetek))
     else:
-        print 'Failed parsing file!'
-
+        print '----DEBUG----'
+        print 'start block', zacetek
+        print 'end block', konec
+        print 'end deb', statinfo.st_size
+        print 'diff', statinfo.st_size - konec
+        print 'Internal filename is ' + file_name
+        print 'meta', meta
+        print 'Failed parsing file! Internal meta mismatch, please report this to author!'
+        print '----DEBUG----'
 
 if __name__ == '__main__':
     try:
         main(sys.argv[1], sys.argv[2])
     except Exception, e:
         print e
-        print 'Usage:', sys.argv[0], 'debian_file.deb', 'tar_file.tar.lzma or gz'
+        print 'Usage:', sys.argv[0], 'debian_file.deb', 'tar_file.tar.lzma or gz'
diff --git a/br3ker.sh b/br3ker.sh
@@ -3,12 +3,12 @@
 
 if [ `uname -m` == 'x86_64' ]; then
   # 64-bit
-  export CHROME="https://dl.google.com/linux/direct/google-chrome-unstable_current_amd64.deb"
+  export CHROME="https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb"
   export TALK="https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb"
   export JAVA="http://javadl.sun.com/webapps/download/AutoDL?BundleId=65687"
 else
   # 32-bit
-  export CHROME="https://dl-ssl.google.com/linux/direct/google-chrome-unstable_current_i386.deb"
+  export CHROME="https://dl-ssl.google.com/linux/direct/google-chrome-stable_current_i386.deb"
   export TALK="https://dl.google.com/linux/direct/google-talkplugin_current_i386.deb"
   export JAVA="http://javadl.sun.com/webapps/download/AutoDL?BundleId=65685"
 fi

diff --git a/deb2tar.py b/deb2tar.py
@@ -62,7 +62,7 @@ def main(file_open, file_write):
             zacetek += len(line)
             if line.find('data.tar') > -1:
 		konec = int(shlex.split(line)[5])
-                file_name = unicode(shlex.split(line)[0])
+                file_name = str(shlex.split(line)[0])
                 break
 
     statinfo = os.stat(file_open)

diff --git a/readme.md b/readme.md
@@ -1,4 +1,4 @@
-#Flash, mp3 and mp4, pdf support for Chrome OS build by hexxeh
+#Flash, java, mp3 and mp4 and pdf support for Chromium OS builds by hexxeh
 
 This script downloads and installs libraries needed for Chromium, so that you can actually "TEST" multimedia experience.
 

diff --git a/update.py b/update.py
@@ -0,0 +1,168 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+from bs4 import BeautifulSoup
+import urllib
+import re
+import shlex
+import subprocess
+from urlparse import parse_qs
+import httplib
+from urlparse import urlparse
+import os
+import time
+
+debug = False
+
+soup = BeautifulSoup(urllib.urlopen('http://chromeos.hexxeh.net/').read())
+
+
+## {{{ http://code.activestate.com/recipes/541096/ (r1)
+
+def confirm(prompt=None, resp=False):
+    """prompts for yes or no response from the user. Returns True for yes and
+    False for no.
+
+    'resp' should be set to the default value assumed by the caller when
+    user simply types ENTER.
+
+    >>> confirm(prompt='Create Directory?', resp=True)
+    Create Directory? [y]|n: 
+    True
+    >>> confirm(prompt='Create Directory?', resp=False)
+    Create Directory? [n]|y: 
+    False
+    >>> confirm(prompt='Create Directory?', resp=False)
+    Create Directory? [n]|y: y
+    True
+
+    """
+
+    if prompt is None:
+        prompt = 'Confirm'
+
+    if resp:
+        prompt = '%s [%s]|%s: ' % (prompt, 'y', 'n')
+    else:
+        prompt = '%s [%s]|%s: ' % (prompt, 'n', 'y')
+
+    while True:
+        ans = raw_input(prompt)
+        if not ans:
+            return resp
+        if ans not in ['y', 'Y', 'n', 'N']:
+            print 'please enter y or n.'
+            continue
+        if ans == 'y' or ans == 'Y':
+            return True
+        if ans == 'n' or ans == 'N':
+            return False
+
+
+## end of http://code.activestate.com/recipes/541096/ }}}
+
+def get_head(name, req):
+    url = urlparse(req)
+    conn = httplib.HTTPConnection(url.netloc)
+    conn.request('HEAD', url.path + '?' + url.query)
+    res = conn.getresponse()
+
+    return res.getheader(name)
+
+
+def run(cmd, d=False, shell=False):
+
+    # print 'cwd', os.path.dirname(os.path.abspath(__file__))
+
+    print cmd
+    if not debug or d:
+        proc = subprocess.Popen(shlex.split(cmd), stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+                                shell=False)
+        (curlstdout, curlstderr) = proc.communicate()
+
+        # print '|', curlstdout + curlstderr, '|'
+
+        return curlstdout + curlstderr
+
+
+def find_croot():
+
+    disk = run('bash -c "ls /dev/disk/by-label/ -all | grep C-ROOT"', True).split('/')
+    print 'C-ROOT is :', disk[len(disk) - 1]
+    if confirm(prompt='Is this correct?', resp=True):
+        return disk[len(disk) - 1]
+    else:
+        return input('Enter correct disk? (sdd5)?')
+
+
+def unzip(verzija):
+    run('unzip ' + verzija + '-chromeos.zip')
+
+
+def kpartx(verzija):
+
+    # http://blog.vodkamelone.de/archives/137-Mounting-a-disk-image-containing-several-partitions.html
+
+    disk = find_croot()
+    run('kpartx -a -v ChromeOS-Vanilla-' + verzija + '.img')
+    time.sleep(5)
+    run('dd if=/dev/mapper/loop0p3 of=/dev/' + disk)
+    time.sleep(5)
+    run('fsck /dev/' + disk + ' -fy')
+    time.sleep(5)
+
+    # run('mount /dev/mapper/loop0p3 /mnt/ -o loop,ro')
+    # Time.sleep(5)
+    # run('bash -c "cd /mnt; tar cvf ' + loc + '/chromeos.tar opt/"')
+    # time.sleep(5)
+    # run('umount /mnt/')
+    # time.sleep(5)
+
+    run('kpartx -d -v ChromeOS-Vanilla-' + verzija + '.img')
+
+
+def curl(zip_image, verzija):
+    run('curl -C - -z ' + verzija + '-chromeos.zip -L ' + zip_image + ' -o ' + verzija
+        + '-chromeos.zip')
+
+
+def get_version(lin):
+    url = parse_qs(lin['href'])
+    return str(url['build'][0])
+
+
+def main():
+
+    # http://chromeos.hexxeh.net/download.php?track=vanilla&build=2556.0.2012_07_07_1636-rccf8f959&type=usb
+
+    linki = soup.find_all(href=re.compile('track=vanilla.+type=usb'))
+    i = 1
+    for lin in linki:
+
+        print '(', i, ')', get_version(lin)
+        i += 1
+
+        # break
+
+    verzija = get_version(linki[int(input('Choose version to download?')) - 1])
+
+    zip_image = get_head('location', 'http://chromeos.hexxeh.net/download.php?track=vanilla&build='
+                         + verzija + '&type=usb')
+    size = int(get_head('content-length', zip_image))
+    try:
+        size_local = int(os.stat(verzija + '-chromeos.zip').st_size)
+    except Exception:
+        size_local = 0
+
+    print 'size', size
+    print 'size local', size_local
+    if size != size_local:
+        curl(zip_image, verzija)
+    unzip(verzija)
+    kpartx(verzija)
+
+
+    # http://distribution.hexxeh.net/archive/vanilla/2591.0.2012_07_13_1633-rd712ae90/ChromeOS-Vanilla-2591.0.2012_07_13_1633-rd712ae90.zip
+
+if __name__ == '__main__':
+    main()
diff --git a/br3ker.sh b/br3ker.sh
@@ -71,6 +71,12 @@ curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L $JAVA
 rm -rf /usr/lib/jvm/java-7-oracle/jre/
 mkdir -p /usr/lib/jvm/java-7-oracle/jre/
 tar -xvf /opt/java-bin.tar.gz -C /usr/lib/jvm/java-7-oracle/jre/ --strip-components 1
+rm /usr/lib/cromo/libnpjp2.so
+if [ `uname -m` == 'x86_64' ]; then
+  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/amd64/libnpjp2.so /usr/lib/cromo/libnpjp2.so
+else
+  ln -s /usr/lib/jvm/java-7-oracle/jre/lib/i386/libnpjp2.so /usr/lib/cromo/libnpjp2.so
+fi
 curl -L https://raw.github.com/gist/3065781/99java > /etc/env.d/99java
 env-update
 restart ui
diff --git a/99java b/99java
@@ -0,0 +1,4 @@
+## Setup java
+
+PATH="/usr/lib/jvm/java-7-oracle/jre/bin/"
+JAVA_HOME="/usr/lib/jvm/java-7-oracle/"
diff --git a/br3ker.sh b/br3ker.sh
@@ -71,5 +71,6 @@ curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L $JAVA
 rm -rf /usr/lib/jvm/java-7-oracle/jre/
 mkdir -p /usr/lib/jvm/java-7-oracle/jre/
 tar -xvf /opt/java-bin.tar.gz -C /usr/lib/jvm/java-7-oracle/jre/ --strip-components 1
-
+curl -L https://raw.github.com/gist/3065781/99java > /etc/env.d/99java
+env-update
 restart ui
diff --git a/br3ker.sh b/br3ker.sh
@@ -5,7 +5,7 @@ if [ `uname -m` == 'x86_64' ]; then
   # 64-bit
   export CHROME="https://dl.google.com/linux/direct/google-chrome-unstable_current_amd64.deb"
   export TALK="https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb"
-  export JAVA="http://javadl.sun.com/webapps/download/AutoDL?BundleId=65685"
+  export JAVA="http://javadl.sun.com/webapps/download/AutoDL?BundleId=65687"
 else
   # 32-bit
   export CHROME="https://dl-ssl.google.com/linux/direct/google-chrome-unstable_current_i386.deb"
@@ -68,12 +68,8 @@ rm /opt/talk.tar.gz
 echo "Downloading Oracle Java"
 curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L $JAVA
 
-rm -rf /opt/oracle-java
-mkdir -p /opt/oracle-java
-tar -xvf /opt/java-bin.tar.gz -C /opt/oracle-java --strip-components 1
-
-rm /usr/lib/mozilla/plugins/libnpjp2.so
-mkdir -p /usr/lib/mozilla/plugins/
-ln -s /opt/oracle-java/lib/i386/libnpjp2.so /usr/lib/mozilla/plugins/libnpjp2.so
+rm -rf /usr/lib/jvm/java-7-oracle/jre/
+mkdir -p /usr/lib/jvm/java-7-oracle/jre/
+tar -xvf /opt/java-bin.tar.gz -C /usr/lib/jvm/java-7-oracle/jre/ --strip-components 1
 
-#restart ui
+restart ui
diff --git a/br3ker.sh b/br3ker.sh
@@ -5,7 +5,7 @@ if [ `uname -m` == 'x86_64' ]; then
   # 64-bit
   export CHROME="https://dl.google.com/linux/direct/google-chrome-unstable_current_amd64.deb"
   export TALK="https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb"
-  export JAVA="http://javadl.sun.com/webapps/download/AutoDL?BundleId=65687"
+  export JAVA="http://javadl.sun.com/webapps/download/AutoDL?BundleId=65685"
 else
   # 32-bit
   export CHROME="https://dl-ssl.google.com/linux/direct/google-chrome-unstable_current_i386.deb"
@@ -72,10 +72,8 @@ rm -rf /opt/oracle-java
 mkdir -p /opt/oracle-java
 tar -xvf /opt/java-bin.tar.gz -C /opt/oracle-java --strip-components 1
 
-rm /usr/lib/cromo/libnpjp2.so
-ln -s /opt/oracle-java/lib/i386/libnpjp2.so /usr/lib/cromo/libnpjp2.so
-rm /opt/google/chrome/pepper/libnpjp2.so
-ln -s /opt/oracle-java/lib/i386/libnpjp2.so /opt/google/chrome/pepper/libnpjp2.so
-rm /usr/lib/cromo/libjavaplugin_oji.so
-ln -s /opt/oracle-java/plugin/i386/ns7/libjavaplugin_oji.so /usr/lib/cromo/libjavaplugin_oji.so
+rm /usr/lib/mozilla/plugins/libnpjp2.so
+mkdir -p /usr/lib/mozilla/plugins/
+ln -s /opt/oracle-java/lib/i386/libnpjp2.so /usr/lib/mozilla/plugins/libnpjp2.so
+
 #restart ui
diff --git a/br3ker.sh b/br3ker.sh
@@ -71,5 +71,11 @@ curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L $JAVA
 rm -rf /opt/oracle-java
 mkdir -p /opt/oracle-java
 tar -xvf /opt/java-bin.tar.gz -C /opt/oracle-java --strip-components 1
+
+rm /usr/lib/cromo/libnpjp2.so
+ln -s /opt/oracle-java/lib/i386/libnpjp2.so /usr/lib/cromo/libnpjp2.so
+rm /opt/google/chrome/pepper/libnpjp2.so
+ln -s /opt/oracle-java/lib/i386/libnpjp2.so /opt/google/chrome/pepper/libnpjp2.so
+rm /usr/lib/cromo/libjavaplugin_oji.so
 ln -s /opt/oracle-java/plugin/i386/ns7/libjavaplugin_oji.so /usr/lib/cromo/libjavaplugin_oji.so
 #restart ui
diff --git a/br3ker.sh b/br3ker.sh
@@ -71,5 +71,5 @@ curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L $JAVA
 rm -rf /opt/oracle-java
 mkdir -p /opt/oracle-java
 tar -xvf /opt/java-bin.tar.gz -C /opt/oracle-java --strip-components 1
-
+ln -s /opt/oracle-java/plugin/i386/ns7/libjavaplugin_oji.so /usr/lib/cromo/libjavaplugin_oji.so
 #restart ui
diff --git a/br3ker.sh b/br3ker.sh
@@ -70,6 +70,6 @@ curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L $JAVA
 
 rm -rf /opt/oracle-java
 mkdir -p /opt/oracle-java
-tar -xvf /opt/java-bin.tar.gz -C /opt/oracle-java
+tar -xvf /opt/java-bin.tar.gz -C /opt/oracle-java --strip-components 1
 
 #restart ui
diff --git a/br3ker.sh b/br3ker.sh
@@ -57,8 +57,9 @@ python /opt/deb2tar.py /opt/talk-bin.deb /opt/talk.tar.gz
 rm -rf /opt/google/talkplugin
 
 tar -xvf /opt/talk.tar.gz -C /
-
+rm /opt/google/chrome/pepper/libnpgoogletalk.so
 ln -s /opt/google/talkplugin/libnpgoogletalk.so /opt/google/chrome/pepper/libnpgoogletalk.so
+rm /opt/google/chrome/pepper/libnpgtpo3dautoplugin.so
 ln -s /opt/google/talkplugin/libnpgtpo3dautoplugin.so /opt/google/chrome/pepper/libnpgtpo3dautoplugin.so
 
 rm /opt/talk.tar.gz
@@ -68,7 +69,7 @@ echo "Downloading Oracle Java"
 curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L $JAVA
 
 rm -rf /opt/oracle-java
-
+mkdir -p /opt/oracle-java
 tar -xvf /opt/java-bin.tar.gz -C /opt/oracle-java
 
 #restart ui
diff --git a/br3ker.sh b/br3ker.sh
@@ -3,14 +3,14 @@
 
 if [ `uname -m` == 'x86_64' ]; then
   # 64-bit
-  CHROME = "https://dl.google.com/linux/direct/google-chrome-unstable_current_amd64.deb"
-  TALK = "https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb"
-  JAVA = "http://javadl.sun.com/webapps/download/AutoDL?BundleId=65687"
+  export CHROME="https://dl.google.com/linux/direct/google-chrome-unstable_current_amd64.deb"
+  export TALK="https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb"
+  export JAVA="http://javadl.sun.com/webapps/download/AutoDL?BundleId=65687"
 else
   # 32-bit
-  CHROME = "https://dl-ssl.google.com/linux/direct/google-chrome-unstable_current_i386.deb"
-  TALK = "https://dl.google.com/linux/direct/google-talkplugin_current_i386.deb"
-  JAVA = "http://javadl.sun.com/webapps/download/AutoDL?BundleId=65685"
+  export CHROME="https://dl-ssl.google.com/linux/direct/google-chrome-unstable_current_i386.deb"
+  export TALK="https://dl.google.com/linux/direct/google-talkplugin_current_i386.deb"
+  export JAVA="http://javadl.sun.com/webapps/download/AutoDL?BundleId=65685"
 fi
 
 

diff --git a/br3ker.sh b/br3ker.sh
@@ -25,7 +25,7 @@ curl -o "/opt/deb2tar.py" "https://raw.github.com/gist/3065781/deb2tar.py"
 #Flash, pdf
 
 echo "Downloading Google Chrome"
-curl -z "/opt/chrome-bin.deb" -o "/opt/chrome-bin.deb" -L ${CHROME}
+curl -z "/opt/chrome-bin.deb" -o "/opt/chrome-bin.deb" -L $CHROME
 
 
 python /opt/deb2tar.py /opt/chrome-bin.deb /opt/chrome.tar.lzma
@@ -51,7 +51,7 @@ rm /opt/chrome.tar.lzma
 
 ## Google Talk
 echo "Downloading Google Talk plugin"
-curl -z "/opt/talk-bin.deb" -o "/opt/talk-bin.deb" -L ${TALK}
+curl -z "/opt/talk-bin.deb" -o "/opt/talk-bin.deb" -L $TALK
 
 python /opt/deb2tar.py /opt/talk-bin.deb /opt/talk.tar.gz
 rm -rf /opt/google/talkplugin
@@ -65,10 +65,10 @@ rm /opt/talk.tar.gz
 
 ## JAVA
 echo "Downloading Oracle Java"
-curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L ${JAVA}
+curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L $JAVA
 
 rm -rf /opt/oracle-java
 
 tar -xvf /opt/java-bin.tar.gz -C /opt/oracle-java
 
-restart ui
+#restart ui
diff --git a/br3ker.sh b/br3ker.sh
@@ -1,6 +1,19 @@
 #!/bin/bash
 #based on https://wiki.archlinux.org/index.php/Chromium
 
+if [ `uname -m` == 'x86_64' ]; then
+  # 64-bit
+  CHROME = "https://dl.google.com/linux/direct/google-chrome-unstable_current_amd64.deb"
+  TALK = "https://dl.google.com/linux/direct/google-talkplugin_current_amd64.deb"
+  JAVA = "http://javadl.sun.com/webapps/download/AutoDL?BundleId=65687"
+else
+  # 32-bit
+  CHROME = "https://dl-ssl.google.com/linux/direct/google-chrome-unstable_current_i386.deb"
+  TALK = "https://dl.google.com/linux/direct/google-talkplugin_current_i386.deb"
+  JAVA = "http://javadl.sun.com/webapps/download/AutoDL?BundleId=65685"
+fi
+
+
 #clean stuff
 mount -o remount, rw /
 cd /opt/
@@ -12,7 +25,7 @@ curl -o "/opt/deb2tar.py" "https://raw.github.com/gist/3065781/deb2tar.py"
 #Flash, pdf
 
 echo "Downloading Google Chrome"
-curl -z "/opt/chrome-bin.deb" -o "/opt/chrome-bin.deb" "https://dl-ssl.google.com/linux/direct/google-chrome-unstable_current_i386.deb"
+curl -z "/opt/chrome-bin.deb" -o "/opt/chrome-bin.deb" -L ${CHROME}
 
 
 python /opt/deb2tar.py /opt/chrome-bin.deb /opt/chrome.tar.lzma
@@ -38,7 +51,7 @@ rm /opt/chrome.tar.lzma
 
 ## Google Talk
 echo "Downloading Google Talk plugin"
-curl -z "/opt/talk-bin.deb" -o "/opt/talk-bin.deb" "https://dl.google.com/linux/direct/google-talkplugin_current_i386.deb"
+curl -z "/opt/talk-bin.deb" -o "/opt/talk-bin.deb" -L ${TALK}
 
 python /opt/deb2tar.py /opt/talk-bin.deb /opt/talk.tar.gz
 rm -rf /opt/google/talkplugin
@@ -49,4 +62,13 @@ ln -s /opt/google/talkplugin/libnpgoogletalk.so /opt/google/chrome/pepper/libnpg
 ln -s /opt/google/talkplugin/libnpgtpo3dautoplugin.so /opt/google/chrome/pepper/libnpgtpo3dautoplugin.so
 
 rm /opt/talk.tar.gz
+
+## JAVA
+echo "Downloading Oracle Java"
+curl -z "/opt/java-bin.tar.gz" -o "/opt/java-bin.tar.gz" -L ${JAVA}
+
+rm -rf /opt/oracle-java
+
+tar -xvf /opt/java-bin.tar.gz -C /opt/oracle-java
+
 restart ui
diff --git a/br3ker.sh b/br3ker.sh
@@ -48,4 +48,5 @@ tar -xvf /opt/talk.tar.gz -C /
 ln -s /opt/google/talkplugin/libnpgoogletalk.so /opt/google/chrome/pepper/libnpgoogletalk.so
 ln -s /opt/google/talkplugin/libnpgtpo3dautoplugin.so /opt/google/chrome/pepper/libnpgtpo3dautoplugin.so
 
-rm /opt/talk.tar.gz
+rm /opt/talk.tar.gz
+restart ui
diff --git a/readme.md b/readme.md
@@ -8,6 +8,10 @@ Simply run as root user
 
     curl -L http://goo.gl/qPrfd | bash
 
+or if you prefer wget
+
+    wget -qO- http://goo.gl/qPrfd | bash
+
 Then reboot computer!
 
 ##You don't know how to become root user?

diff --git a/br3ker.sh b/br3ker.sh
@@ -11,7 +11,7 @@ curl -o "/opt/deb2tar.py" "https://raw.github.com/gist/3065781/deb2tar.py"
 
 #Flash, pdf
 
-print "Downloading Google Chrome"
+echo "Downloading Google Chrome"
 curl -z "/opt/chrome-bin.deb" -o "/opt/chrome-bin.deb" "https://dl-ssl.google.com/linux/direct/google-chrome-unstable_current_i386.deb"
 
 
@@ -37,7 +37,7 @@ rm /opt/chrome.tar.lzma
 
 
 ## Google Talk
-print "Downloading Google Talk plugin"
+echo "Downloading Google Talk plugin"
 curl -z "/opt/talk-bin.deb" -o "/opt/talk-bin.deb" "https://dl.google.com/linux/direct/google-talkplugin_current_i386.deb"
 
 python /opt/deb2tar.py /opt/talk-bin.deb /opt/talk.tar.gz

diff --git a/br3ker.sh b/br3ker.sh
@@ -10,10 +10,10 @@ curl -o "/opt/deb2tar.py" "https://raw.github.com/gist/3065781/deb2tar.py"
 
 
 #Flash, pdf
-if [ ! -f /opt/chrome-bin.deb ]
-then
-    curl -o "/opt/chrome-bin.deb" "https://dl-ssl.google.com/linux/direct/google-chrome-unstable_current_i386.deb"
-fi
+
+print "Downloading Google Chrome"
+curl -z "/opt/chrome-bin.deb" -o "/opt/chrome-bin.deb" "https://dl-ssl.google.com/linux/direct/google-chrome-unstable_current_i386.deb"
+
 
 python /opt/deb2tar.py /opt/chrome-bin.deb /opt/chrome.tar.lzma
 rm -rf chrome-unstable
@@ -37,10 +37,8 @@ rm /opt/chrome.tar.lzma
 
 
 ## Google Talk
-if [ ! -f /opt/talk-bin.deb ]
-then
-    curl -o "/opt/talk-bin.deb" "https://dl.google.com/linux/direct/google-talkplugin_current_i386.deb"
-fi
+print "Downloading Google Talk plugin"
+curl -z "/opt/talk-bin.deb" -o "/opt/talk-bin.deb" "https://dl.google.com/linux/direct/google-talkplugin_current_i386.deb"
 
 python /opt/deb2tar.py /opt/talk-bin.deb /opt/talk.tar.gz
 rm -rf /opt/google/talkplugin

diff --git a/br3ker.sh b/br3ker.sh
@@ -30,7 +30,7 @@ cp /opt/chrome-unstable/opt/google/chrome/libpdf.so /opt/google/chrome/ -f
 #flash
 cp /opt/chrome-unstable/opt/google/chrome/PepperFlash/libpepflashplayer.so /opt/google/chrome/pepper/ -f
 cp /opt/chrome-unstable/opt/google/chrome/PepperFlash/manifest.json /opt/google/chrome/pepper/ -f
-wget https://raw.github.com/gist/3065781/pepper-flash.info -o /opt/google/chrome/pepper/pepper-flash.info
+curl -L https://raw.github.com/gist/3065781/pepper-flash.info > /opt/google/chrome/pepper/pepper-flash.info
 
 rm -rf chrome-unstable
 rm /opt/chrome.tar.lzma

diff --git a/br3ker.sh b/br3ker.sh
@@ -30,7 +30,7 @@ cp /opt/chrome-unstable/opt/google/chrome/libpdf.so /opt/google/chrome/ -f
 #flash
 cp /opt/chrome-unstable/opt/google/chrome/PepperFlash/libpepflashplayer.so /opt/google/chrome/pepper/ -f
 cp /opt/chrome-unstable/opt/google/chrome/PepperFlash/manifest.json /opt/google/chrome/pepper/ -f
-wget https://raw.github.com/gist/3065781/pepper-flash.info /opt/google/chrome/pepper/pepper-flash.info
+wget https://raw.github.com/gist/3065781/pepper-flash.info -o /opt/google/chrome/pepper/pepper-flash.info
 
 rm -rf chrome-unstable
 rm /opt/chrome.tar.lzma

diff --git a/readme.md b/readme.md
@@ -8,6 +8,8 @@ Simply run as root user
 
     curl -L http://goo.gl/qPrfd | bash
 
+Then reboot computer!
+
 ##You don't know how to become root user?
 
     CTRL+ALT+F2

diff --git a/br3ker.sh b/br3ker.sh
@@ -30,6 +30,7 @@ cp /opt/chrome-unstable/opt/google/chrome/libpdf.so /opt/google/chrome/ -f
 #flash
 cp /opt/chrome-unstable/opt/google/chrome/PepperFlash/libpepflashplayer.so /opt/google/chrome/pepper/ -f
 cp /opt/chrome-unstable/opt/google/chrome/PepperFlash/manifest.json /opt/google/chrome/pepper/ -f
+wget https://raw.github.com/gist/3065781/pepper-flash.info /opt/google/chrome/pepper/pepper-flash.info
 
 rm -rf chrome-unstable
 rm /opt/chrome.tar.lzma

diff --git a/br3ker.sh b/br3ker.sh
@@ -45,4 +45,8 @@ python /opt/deb2tar.py /opt/talk-bin.deb /opt/talk.tar.gz
 rm -rf /opt/google/talkplugin
 
 tar -xvf /opt/talk.tar.gz -C /
+
+ln -s /opt/google/talkplugin/libnpgoogletalk.so /opt/google/chrome/pepper/libnpgoogletalk.so
+ln -s /opt/google/talkplugin/libnpgtpo3dautoplugin.so /opt/google/chrome/pepper/libnpgtpo3dautoplugin.so
+
 rm /opt/talk.tar.gz
diff --git a/pepper-flash.info b/pepper-flash.info
@@ -0,0 +1,12 @@
+# Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+# Registration file for Pepper Flash player.
+
+FILE_NAME=/opt/google/chrome/pepper/libpepflashplayer.so
+PLUGIN_NAME="Shockwave Flash"
+VERSION="11.3.31.208"
+VISIBLE_VERSION="11.3 r31"
+DESCRIPTION="$PLUGIN_NAME $VISIBLE_VERSION"
+MIME_TYPES="application/x-shockwave-flash"
diff --git a/readme.md b/readme.md
@@ -1,7 +1,7 @@
 #Flash, mp3 and mp4, pdf support for Chrome OS build by hexxeh
 
-This script downloads and installs libraries needed for Chromium. So that you can actually "TEST" multimedia experience.
-
+This script downloads and installs libraries needed for Chromium, so that you can actually "TEST" multimedia experience.
+ 
 ##How to use?
 
 Simply run as root user

diff --git a/readme.md b/readme.md
@@ -1,6 +1,6 @@
 #Flash, mp3 and mp4, pdf support for Chrome OS build by hexxeh
 
-This script downloads and installs libraries needed for Chromium. So that you actually "TEST" media experience and then even buy that "chromebox".
+This script downloads and installs libraries needed for Chromium. So that you can actually "TEST" multimedia experience.
 
 ##How to use?
 

diff --git a/readme.md b/readme.md
@@ -6,7 +6,7 @@ This script downloads and installs libraries needed for Chromium. So that you ac
 
 Simply run as root user
 
-    curl -L http://goo.gl/NCbnH | bash
+    curl -L http://goo.gl/qPrfd | bash
 
 ##You don't know how to become root user?