diff --git a/README.md b/README.md index 7947681fe..941a7d39b 100644 --- a/README.md +++ b/README.md @@ -14,25 +14,31 @@ 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 - -Then: - - cd lockerbox/Locker + apt-get install imagemagick + npm install + make deps make + +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. + + ### 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). diff --git a/scripts/install-deps b/scripts/install-deps index d60ab1d51..f7f3f37d0 100755 --- a/scripts/install-deps +++ b/scripts/install-deps @@ -209,10 +209,18 @@ 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