diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rwxr-xr-x | experimental/webtry/setup/setup_jail.sh | 4 | ||||
| -rwxr-xr-x | experimental/webtry/setup/webtry_setup.sh | 9 |
3 files changed, 10 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index ceacb7be45..32a7cf1020 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,9 @@ .project .settings/ TAGS +bower_components common +experimental/webtry/webtry.db gyp/build out platform_tools/chromeos/third_party/externals @@ -16,4 +18,3 @@ platform_tools/chromeos/toolchain third_party/externals tools/bug_chomper/oauth_client_secret.json xcodebuild -bower_components diff --git a/experimental/webtry/setup/setup_jail.sh b/experimental/webtry/setup/setup_jail.sh index 6b50c3bf5d..d80a1181f4 100755 --- a/experimental/webtry/setup/setup_jail.sh +++ b/experimental/webtry/setup/setup_jail.sh @@ -1,4 +1,6 @@ -apt-get install -y g++ libfreetype6 libfreetype6-dev libpng12-0 libpng12-dev libglu1-mesa-dev mesa-common-dev freeglut3-dev libgif-dev libfontconfig libfontconfig-dev git python wget +apt-get install -y g++ libfreetype6 libfreetype6-dev libpng12-0 libpng12-dev \ +libglu1-mesa-dev mesa-common-dev freeglut3-dev libgif-dev libfontconfig \ +libfontconfig-dev git python wget mkdir /skia_build chmod 777 /skia_build diff --git a/experimental/webtry/setup/webtry_setup.sh b/experimental/webtry/setup/webtry_setup.sh index 43f0adc195..848ea0abc5 100755 --- a/experimental/webtry/setup/webtry_setup.sh +++ b/experimental/webtry/setup/webtry_setup.sh @@ -21,7 +21,7 @@ sudo chmod 777 /home/webtry/cache/src sudo cp ../sys/webtry_schroot /etc/schroot/chroot.d/webtry CHROOT_JAIL=/srv/chroot/webtry_gyp -# Build the chroot environment +# Build the chroot environment. if [ ! -d ${CHROOT_JAIL} ]; then sudo mkdir -p ${CHROOT_JAIL} @@ -32,8 +32,8 @@ if [ ! -d ${CHROOT_JAIL} ]; then sudo sh -c "echo 'none /dev/shm tmpfs rw,nosuid,nodev,noexec 0 0' >> ${CHROOT_JAIL}/etc/fstab" fi -# the continue_install script will fetch the latest versions of -# skia and depot_tools. We split up the installation process into +# The continue_install script will fetch the latest versions of +# skia and depot_tools. We split up the installation process into # two pieces like this so that the continue_install script can # be run independently of this one to fetch and build the latest skia. @@ -45,6 +45,7 @@ sudo cp ../sys/webtry_squid /etc/squid3/squid.conf sudo chmod 744 /etc/init.d/webtry # Confirm that monit is happy. - sudo monit -t sudo monit reload + +sudo /etc/init.d/webtry restart |