diff --git a/CHANGELOG.md b/CHANGELOG.md index e104898..69e1fb6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,9 @@ MumbleDJ Changelog ================== +### February 3, 2015 -- `v2.4.1` +* Made it possible to place MumbleDJ binary in `~/bin` instead of `/usr/local/bin` if the folder exists. + ### February 2, 2015 -- `v2.3.4, v2.3.5, v2.3.6, v2.3.7, v2.4.0` * Added panic on audio play fail for debugging purposes. * Fixed '!' being recognized as '!skipplaylist'. diff --git a/Makefile b/Makefile index bffaa29..5bf8652 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ install: mkdir -p ~/.mumbledj/songs if [ -a ~/.mumbledj/config/mumbledj.gcfg ]; then mv ~/.mumbledj/config/mumbledj.gcfg ~/.mumbledj/config/mumbledj_backup.gcfg; fi; cp -u mumbledj.gcfg ~/.mumbledj/config/mumbledj.gcfg - sudo cp -f mumbledj /usr/local/bin/mumbledj + if [ -d ~/bin ]; then cp -f mumbledj ~/bin/mumbledj; else sudo cp -f mumbledj /usr/local/bin/mumbledj; fi; build: goop go build . diff --git a/README.md b/README.md index 54b0070..82675f3 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,8 @@ Installation for v2 of MumbleDJ is much easier than it was before, due to the re **3)** Install [`youtube-dl`](https://github.com/rg3/youtube-dl#installation). It is recommended to install `youtube-dl` through the method described on the linked GitHub page, rather than installing through a distribution repository. This ensures that you get the most up-to-date version of `youtube-dl`. +**4)** If you wish to install MumbleDJ without any further root privileges, make sure that `~/bin` exists and is added to your `$PATH`. If this step is not done, the `Makefile` will place the MumbleDJ binary in `/usr/local/bin` instead, which requires root privileges. + **4)** Clone the `MumbleDJ` repository or [download the latest release](https://github.com/matthieugrieger/mumbledj/releases). **5)** `cd` into the `MumbleDJ` repository directory and execute the following commands: