Updated the Readme.

Bugfix on install.sh too.
s
Signed-off-by: primis <[email protected]>

Author: primis

README.md

@@ -21,30 +21,13 @@ This is just one tool in the chain. `notes` is a command line tool, and some peo
 
 ## How do I install this?
 
-Download `notes`, `chmod +x`, put it in your `$path`. This will probably do it:
 
 ```bash
-curl https://cdn.rawgit.com/pimterry/notes/v0.2.0/notes > /usr/local/bin/notes && chmod +x /usr/local/bin/notes
+curl https://cdn.rawgit.com/pimterry/notes/master/install.sh | bash
 ```
 
 By default your notes live in ~/notes, but you can change that to anywhere you like by setting the `$NOTES_DIRECTORY` environmental variable. See [how do I configure this?](#how-do-i-configure-this) for more details.
 
-#### Installing Bash completion
-
-`notes` includes bash autocompletion, to let you tab-complete commands and your note names. This requires Bash > 4.0 and [bash-completion](https://github.com/scop/bash-completion) to be installed - it's probably available from your friendly local package manager.
-
-To enable completion for notes, copy the completion script into your bash completion directory, and it should be automatically loaded. The bash completion directory is `/usr/share/bash-completion/completions/` on a typical Debian install, or `/usr/local/etc/bash_completion.d/` on OSX with `bash-completion` from homebrew. You may be able to find your own bash completion directory by running the following command:
-
-    pkg-config --variable=completionsdir bash-completion
-
-Installing the completions might be as follows:
-
-```bash
-curl https://cdn.rawgit.com/pimterry/notes/v0.2.0/notes.bash_completion > /usr/share/bash-completion/completions/notes
-```
-
-You'll need to open a new shell for this to take effect.
-
 ## How do I configure this?
 
 To get started with you'll want to set `$EDITOR` to your favourite text editor, and probably `$NOTES_DIRECTORY` to the directory in which you'd like to use to store your notes (this defaults to `~/notes`). You'll typically want to set these as environment variables in your `.bashrc`, `.zshrc`, or similar.

install.sh

@@ -12,12 +12,12 @@ function assertInstalled() {
     done
 }
 
-# Pre-setup check for bash completion directory
-bash_completion_dir=`pkg-config --variable=completionsdir bash-completion` 2>/dev/null
-
 # Yay, Echo self documents! :D
 echo "Checking for root..."
     [ "$(whoami)" != "root" ] && exec sudo -- "$0" "$@"
+# Get user's home directory so we can dum config later
+user_home=$(getent passwd $SUDO_USER | cut -d: -f6)
+
 
 echo "Checking for Dependencies..."
     assertInstalled bash curl tar
@@ -26,16 +26,19 @@ echo "Downloading and Extracting Notes from Repository..."
     extract_dir=$(mktemp -d)
     curl -L https://api.github.com/repos/pimterry/notes/tarball | tar -xzp -C $extract_dir --strip-components=1
 
+# Pre-setup check for bash completion directory
+bash_completion_dir=`pkg-config --variable=completionsdir bash-completion` 2>/dev/null
+
 echo "Moving Files into Place..."
-    mv "$extract_dir"/notes /usr/local/bin/notes
+    mv $extract_dir/notes /usr/local/bin/notes
     # Make it runnable
     chmod a+x /usr/local/bin/notes
     # Do we have bash completion abilities?
-    if [ -d "$bash_completion_dir" ]; then
-        mv "$extract_dir"/notes.bash_completion "$bash_completions_dir"/notes
+    if [ -d $bash_completion_dir ]; then
+        mv $extract_dir/notes.bash_completion $bash_completion_dir/notes
     fi
-    mkdir -p ~/.config/notes/
-    mv "$extract_dir"/config.example ~/.config/notes/config.example
+    mkdir -p $user_home/.config/notes/
+    mv $extract_dir/config.example $user_home/.config/notes/config.example
 
 echo "Cleaning Up..."
     rm -rf $extract_dir