From da7ccdac34e21d1bb64566a212bbf4072f6b8f44 Mon Sep 17 00:00:00 2001 From: Akshaya Date: Mon, 11 Jun 2012 06:55:09 +0300 Subject: [PATCH 1/6] Update master --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 7947681fe..20a300909 100644 --- a/README.md +++ b/README.md @@ -14,21 +14,21 @@ We also have a [mailing list](http://bit.ly/singly-dev-list) setup. Join and sa ### The Fast Way -Lockerbox (by [pib](https://www.github.com/pib)) is a straightforward way to get all the high-level dependencies installed at once. It will make a single directory called lockerbox and get everything set up inside of there. +Get the locker source code: - curl https://raw.github.com/LockerProject/lockerbox/master/lockerbox.sh > lockerbox.sh - chmod 0755 lockerbox.sh - ./lockerbox.sh + git clone https://github.com/LockerProject/Locker.git + cd Locker + git submodule update --init -When that successfully completes, add lockerbox/local/bin to your path: +Then install dependencies (this may take a little while): - echo 'export PATH=$PATH:'`pwd`/lockerbox/local/bin >> ~/.profile - source ~/.profile + apt-get install imagemagick + npm install + make deps + make -Then: +Then run the locker: - cd lockerbox/Locker - make ./locker now open [http://localhost:8042/](http://localhost:8042/) in your browser! From 8251c69ffef361209648353e89682c90776d3a0b Mon Sep 17 00:00:00 2001 From: Akshaya Date: Mon, 11 Jun 2012 07:28:53 +0300 Subject: [PATCH 2/6] Update patch-1 --- scripts/install-deps | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/install-deps b/scripts/install-deps index d60ab1d51..84db9c07e 100755 --- a/scripts/install-deps +++ b/scripts/install-deps @@ -209,10 +209,17 @@ fi if ! check_for ImageMagick convert "convert --version" 6.0 then if [ "$check_only" = true ]; then exit 1; fi - - echo "You need ImageMagick, but this script doesn't know how to install it for you." >&2 - echo "Please install it and try again." - exit 1 + + echo "" + echo "Installing ImageMagick, please input the password, if asked." + sudo apt-get install imagemagick + if check_for ImageMagick convert "convert --version" 6.0 + then + echo "Installed ImageMagick." + else + echo "Failed to install ImageMagick." >&2 + exit 1 + fi fi if [ "$check_only" != true ]; then From fdca35979193e961d97641656944fbde46ef0b19 Mon Sep 17 00:00:00 2001 From: Akshaya Date: Mon, 11 Jun 2012 07:29:32 +0300 Subject: [PATCH 3/6] Update patch-1 --- scripts/install-deps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/install-deps b/scripts/install-deps index 84db9c07e..0996060ad 100755 --- a/scripts/install-deps +++ b/scripts/install-deps @@ -210,7 +210,7 @@ if ! check_for ImageMagick convert "convert --version" 6.0 then if [ "$check_only" = true ]; then exit 1; fi - echo "" + echo "" echo "Installing ImageMagick, please input the password, if asked." sudo apt-get install imagemagick if check_for ImageMagick convert "convert --version" 6.0 From 712e8892c1283bc1f6f6e89ce5b413e284ebdaec Mon Sep 17 00:00:00 2001 From: Akshaya Date: Mon, 11 Jun 2012 07:31:13 +0300 Subject: [PATCH 4/6] Update patch-1 --- scripts/install-deps | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/install-deps b/scripts/install-deps index 0996060ad..f7f3f37d0 100755 --- a/scripts/install-deps +++ b/scripts/install-deps @@ -212,14 +212,15 @@ then echo "" echo "Installing ImageMagick, please input the password, if asked." - sudo apt-get install imagemagick + sudo apt-get install imagemagick + if check_for ImageMagick convert "convert --version" 6.0 then echo "Installed ImageMagick." else echo "Failed to install ImageMagick." >&2 exit 1 - fi + fi fi if [ "$check_only" != true ]; then From 9c0ff00f393afd8c28bc8263213de80b16fb14f8 Mon Sep 17 00:00:00 2001 From: Akshaya Date: Mon, 11 Jun 2012 07:40:40 +0300 Subject: [PATCH 5/6] Updated the Locker installation instructions. --- README.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 20a300909..f3b39f4ee 100644 --- a/README.md +++ b/README.md @@ -27,12 +27,20 @@ Then install dependencies (this may take a little while): make deps make -Then run the locker: - +Before you run you'll need to setup the services that you are going to connect to. Follow the directions to +[Get API Keys](GettingAPIKeys). + +To turn on the locker run: + ./locker now open [http://localhost:8042/](http://localhost:8042/) in your browser! +To get started using the system, navigate to the 'Services' menu item, select an account to connect, and follow the instructions to start using that connector with your locker. + +If you have any problems, come ask us in [IRC](http://webchat.freenode.net/?channels=lockerproject), take a look at the [troubleshooting page](https://github.com/LockerProject/Locker/wiki/Troubleshooting-faq). If you solve any problems for yourself, please add your learnings! + + ### The Detailed Way If you encounter errors in "the fast way", or if you want to go through the process of setting everything up manually, check out the [detailed set up instructions](https://github.com/LockerProject/Locker/wiki/Detailed-Set-Up-Instructions). From d660fbe00a2843816337d83a431730f9499f9735 Mon Sep 17 00:00:00 2001 From: Akshaya Date: Mon, 11 Jun 2012 07:41:22 +0300 Subject: [PATCH 6/6] Locker installation instructions udpated. --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index f3b39f4ee..941a7d39b 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,6 @@ now open [http://localhost:8042/](http://localhost:8042/) in your browser! To get started using the system, navigate to the 'Services' menu item, select an account to connect, and follow the instructions to start using that connector with your locker. -If you have any problems, come ask us in [IRC](http://webchat.freenode.net/?channels=lockerproject), take a look at the [troubleshooting page](https://github.com/LockerProject/Locker/wiki/Troubleshooting-faq). If you solve any problems for yourself, please add your learnings! - ### The Detailed Way