| OLD | NEW | 
|---|
| 1 #!/bin/bash | 1 #!/bin/bash | 
| 2 # | 2 # | 
| 3 # The continue_install script updates the jail's copy of depot tools and the lat
    est | 3 # The continue_install script updates the webtry user's copy of skia and depot_t
    ools. | 
| 4 # verion of skia.  It then builds the skia libraries inside the jail, and builds
     the webtry | 4 # It then builds the webtry server outside the jail. | 
| 5 # server outside the jail. | 5 # | 
|  | 6 # The setup scripts should run this script as the 'webtry' user. | 
| 6 # | 7 # | 
| 7 # See the README file for detailed installation instructions. | 8 # See the README file for detailed installation instructions. | 
| 8 | 9 | 
| 9 CHROOT_JAIL=/srv/chroot/webtry_gyp | 10 # Install Go | 
| 10 sudo cp continue_install_jail.sh ${CHROOT_JAIL}/bin/continue_install_jail.sh | 11 | 
| 11 sudo chmod 755 ${CHROOT_JAIL}/bin/continue_install_jail.sh |  | 
| 12 sudo chroot ${CHROOT_JAIL} /bin/continue_install_jail.sh |  | 
| 13 sudo chown -R webtry:webtry ${CHROOT_JAIL}/skia_build/skia |  | 
| 14 cd | 12 cd | 
| 15 | 13 | 
| 16 # Install Go |  | 
| 17 if [ -d go ]; then | 14 if [ -d go ]; then | 
| 18   echo Go already installed. | 15   echo Go already installed. | 
| 19 else | 16 else | 
| 20   wget https://storage.googleapis.com/golang/go1.3.3.linux-amd64.tar.gz | 17   wget https://storage.googleapis.com/golang/go1.3.3.linux-amd64.tar.gz | 
| 21   tar -xzf go1.3.3.linux-amd64.tar.gz | 18   tar -xzf go1.3.3.linux-amd64.tar.gz | 
| 22 fi | 19 fi | 
| 23 | 20 | 
| 24 mkdir ${HOME}/golib | 21 mkdir ${HOME}/golib | 
| 25 export GOROOT=${HOME}/go | 22 export GOROOT=${HOME}/go | 
| 26 export GOPATH=${HOME}/golib | 23 export GOPATH=${HOME}/golib | 
| 27 export PATH=$PATH:$GOROOT/bin | 24 export PATH=$PATH:$GOROOT/bin | 
| 28 | 25 | 
| 29 cd skia/experimental/webtry | 26 # Install depot_tools. | 
|  | 27 if [ -d depot_tools ]; then | 
|  | 28   (cd depot_tools && git pull); | 
|  | 29 else | 
|  | 30   git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git; | 
|  | 31 fi | 
|  | 32 export PATH=$PATH:~/depot_tools | 
|  | 33 | 
|  | 34 # Checkout the skia code and dependencies (again) | 
|  | 35 mkdir skia | 
|  | 36 cd skia | 
|  | 37 gclient config --name . https://skia.googlesource.com/skia.git | 
|  | 38 gclient sync | 
|  | 39 git checkout master | 
|  | 40 | 
|  | 41 cd experimental/webtry | 
| 30 | 42 | 
| 31 go get -d | 43 go get -d | 
| 32 ./build | 44 ./build | 
| OLD | NEW | 
|---|