From a9806ddad0f4ee928656ec53d47889dab1fae253 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Tue, 5 Oct 2010 18:19:20 +0800 Subject: [PATCH 1/2] Fixing bad execute permissions on various *.html, *.js, *.css,*.png etc. --- public/javascripts/fancybox/jquery.easing-1.3.pack.js | 0 public/javascripts/fancybox/jquery.fancybox-1.3.1.css | 0 public/javascripts/fancybox/jquery.fancybox-1.3.1.js | 0 public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js | 0 public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js | 0 public/javascripts/fileuploader.js | 0 public/javascripts/jquery.cycle/jquery.cycle.lite.min.js | 0 public/javascripts/jquery.infieldlabel.js | 0 public/javascripts/web_socket.js | 0 public/stylesheets/blueprint/src/grid.css | 0 public/stylesheets/blueprint/src/print.css | 0 public/stylesheets/blueprint/src/reset.css | 0 .../stylesheets/brandongrotesque_light/Brandon_light-webfont.svg | 0 public/stylesheets/brandongrotesque_light/demo.html | 0 public/stylesheets/brandongrotesque_light/stylesheet.css | 0 public/stylesheets/fileuploader.css | 0 16 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 public/javascripts/fancybox/jquery.easing-1.3.pack.js mode change 100755 => 100644 public/javascripts/fancybox/jquery.fancybox-1.3.1.css mode change 100755 => 100644 public/javascripts/fancybox/jquery.fancybox-1.3.1.js mode change 100755 => 100644 public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js mode change 100755 => 100644 public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js mode change 100755 => 100644 public/javascripts/fileuploader.js mode change 100755 => 100644 public/javascripts/jquery.cycle/jquery.cycle.lite.min.js mode change 100755 => 100644 public/javascripts/jquery.infieldlabel.js mode change 100755 => 100644 public/javascripts/web_socket.js mode change 100755 => 100644 public/stylesheets/blueprint/src/grid.css mode change 100755 => 100644 public/stylesheets/blueprint/src/print.css mode change 100755 => 100644 public/stylesheets/blueprint/src/reset.css mode change 100755 => 100644 public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg mode change 100755 => 100644 public/stylesheets/brandongrotesque_light/demo.html mode change 100755 => 100644 public/stylesheets/brandongrotesque_light/stylesheet.css mode change 100755 => 100644 public/stylesheets/fileuploader.css diff --git a/public/javascripts/fancybox/jquery.easing-1.3.pack.js b/public/javascripts/fancybox/jquery.easing-1.3.pack.js old mode 100755 new mode 100644 diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.css b/public/javascripts/fancybox/jquery.fancybox-1.3.1.css old mode 100755 new mode 100644 diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.js old mode 100755 new mode 100644 diff --git a/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js b/public/javascripts/fancybox/jquery.fancybox-1.3.1.pack.js old mode 100755 new mode 100644 diff --git a/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js b/public/javascripts/fancybox/jquery.mousewheel-3.0.2.pack.js old mode 100755 new mode 100644 diff --git a/public/javascripts/fileuploader.js b/public/javascripts/fileuploader.js old mode 100755 new mode 100644 diff --git a/public/javascripts/jquery.cycle/jquery.cycle.lite.min.js b/public/javascripts/jquery.cycle/jquery.cycle.lite.min.js old mode 100755 new mode 100644 diff --git a/public/javascripts/jquery.infieldlabel.js b/public/javascripts/jquery.infieldlabel.js old mode 100755 new mode 100644 diff --git a/public/javascripts/web_socket.js b/public/javascripts/web_socket.js old mode 100755 new mode 100644 diff --git a/public/stylesheets/blueprint/src/grid.css b/public/stylesheets/blueprint/src/grid.css old mode 100755 new mode 100644 diff --git a/public/stylesheets/blueprint/src/print.css b/public/stylesheets/blueprint/src/print.css old mode 100755 new mode 100644 diff --git a/public/stylesheets/blueprint/src/reset.css b/public/stylesheets/blueprint/src/reset.css old mode 100755 new mode 100644 diff --git a/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg b/public/stylesheets/brandongrotesque_light/Brandon_light-webfont.svg old mode 100755 new mode 100644 diff --git a/public/stylesheets/brandongrotesque_light/demo.html b/public/stylesheets/brandongrotesque_light/demo.html old mode 100755 new mode 100644 diff --git a/public/stylesheets/brandongrotesque_light/stylesheet.css b/public/stylesheets/brandongrotesque_light/stylesheet.css old mode 100755 new mode 100644 diff --git a/public/stylesheets/fileuploader.css b/public/stylesheets/fileuploader.css old mode 100755 new mode 100644 From 8bea8a98b24100676e67c97030ee7e093d475124 Mon Sep 17 00:00:00 2001 From: Alec Leamas Date: Tue, 5 Oct 2010 23:58:28 +0800 Subject: [PATCH 2/2] Don't use any scratch dir, handle write-protected installation --- script/server | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/script/server b/script/server index da43895fd..c5357a32e 100755 --- a/script/server +++ b/script/server @@ -7,9 +7,13 @@ then echo "Mongod not started" else mkdir -p -v log/thin/ - #force AGPL - tar cf ../_source.tar -X .gitignore * - mv ../_source.tar public/source.tar + #force AGPL + test -w public -a ! -e public/source.tar && + tar cf public/source.tar --exclude='source.tar' -X .gitignore * + test -e public/source.tar || { + echo "Can't find, or even create, public/source.tar. Giving up" + exit 2 + } bundle exec ruby ./script/websocket_server.rb& bundle exec thin start $@ fi