From 38d06908469e8af10eb3ccde02d3b92b4e7df621 Mon Sep 17 00:00:00 2001 From: samvaio Date: Sun, 23 Oct 2016 21:48:53 +0530 Subject: [PATCH 1/9] Little improvement, thanks to @fearnlj01#3535 --- docs/guides/OSX Guide.md | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/docs/guides/OSX Guide.md b/docs/guides/OSX Guide.md index a475592a..0994ee1e 100644 --- a/docs/guides/OSX Guide.md +++ b/docs/guides/OSX Guide.md @@ -7,7 +7,7 @@ ####Installing Homebrew -`/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"` +```/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"``` Run `brew update` to fetch the latest package data. @@ -26,14 +26,17 @@ brew install tmux ``` ####Installing .NET Core SDK + - `ln -s /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/` - `ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib /usr/local/lib/` - Download the .NET Core SDK, found [here.](https://go.microsoft.com/fwlink/?LinkID=827526) - Open the `.pkg` file you downloaded and install it. +- `ln -s /usr/local/share/dotnet/dotnet /usr/local/bin` +- `dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json` ####Check your `FFMPEG` -**In case your `FFMPEG` wasnt installed properly** +**In case your `FFMPEG` wasnt installed properly (Optional)** - `brew options ffmpeg` - `brew install ffmpeg --with-x --with-y --with-z` etc. @@ -43,6 +46,7 @@ brew install tmux - Then try `brew install ffmpeg` again. ####Installing xcode-select + Xcode command line tools. You will do this in Terminal.app by running the following command line: `xcode-select --install` @@ -52,9 +56,10 @@ A dialog box will open asking if you want to install `xcode-select`. Select inst ####Downloading and building Nadeko - `cd ~` - `git clone -b 1.0 --recursive https://github.com/Kwoth/NadekoBot.git` -- `cd ~/NadekoBot/` +- `cd ~/NadekoBot/discord.net` - `dotnet restore` - `cd ~/NadekoBot/src/NadekoBot/` +- `dotnet restore` - `dotnet build --configuration Release` ####Creating DiscordBot application @@ -82,23 +87,27 @@ A dialog box will open asking if you want to install `xcode-select`. Select inst - If done correctly, you are now the bot owner. You can add multiple owners by seperating each owner ID with a comma within the square brackets. ####Running NadekoBot - + +-Using tmux + `tmux new -s nadeko` ^this will create a new session named “nadeko” `(you can replace “nadeko” with anything you prefer and remember its your session name)`. -or if you want to use Screen, run: +-Using Screen + +If you want to use Screen, run: `screen -S nadeko` ^this will create a new screen named “nadeko” `(you can replace “nadeko” with anything you prefer and remember its your screen name)`. +- Start Nadeko using dotnet: + `cd ~/NadekoBot/src/NadekoBot/` -- Start Nadeko using dotnet: - `dotnet run --configuration Release` CHECK THE BOT IN DISCORD, IF EVERYTHING IS WORKING @@ -142,4 +151,4 @@ Nadeko is really easy to update as of version 1.0! just copy and paste the comma [Atom]: https://atom.io/ [Invite Guide]: http://discord.kongslien.net/guide.html [Google Console]: https://console.developers.google.com -[Soundcloud]: https://soundcloud.com/you/apps/new \ No newline at end of file +[Soundcloud]: https://soundcloud.com/you/apps/new From bf4d4c700827860cf91b8cb2e2aec69154601f3d Mon Sep 17 00:00:00 2001 From: samvaio Date: Sun, 23 Oct 2016 21:50:17 +0530 Subject: [PATCH 2/9] Little improvement, thanks to @fearnlj01#3535 --- docs/guides/OSX Guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/OSX Guide.md b/docs/guides/OSX Guide.md index 0994ee1e..a92395b7 100644 --- a/docs/guides/OSX Guide.md +++ b/docs/guides/OSX Guide.md @@ -88,14 +88,14 @@ A dialog box will open asking if you want to install `xcode-select`. Select inst ####Running NadekoBot --Using tmux +- Using tmux `tmux new -s nadeko` ^this will create a new session named “nadeko” `(you can replace “nadeko” with anything you prefer and remember its your session name)`. --Using Screen +- Using Screen If you want to use Screen, run: From 3ffa801bbdc606aa148ddbadb7b03f6cab0ad20c Mon Sep 17 00:00:00 2001 From: samvaio Date: Sun, 23 Oct 2016 22:16:48 +0530 Subject: [PATCH 3/9] More changes --- docs/guides/OSX Guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/guides/OSX Guide.md b/docs/guides/OSX Guide.md index a92395b7..23b0df53 100644 --- a/docs/guides/OSX Guide.md +++ b/docs/guides/OSX Guide.md @@ -72,7 +72,7 @@ A dialog box will open asking if you want to install `xcode-select`. Select inst - Keep this window open for now. ####Setting up Credentials.json file -- Open up the `NadekoBot` folder, which should be in your home directory, then the `src` folder and then the additonal `NadekoBot` folder. +- Open up the `NadekoBot` folder, which should be in your home directory, then `NadekoBot` folder then `src` folder and then the additonal `NadekoBot` folder. - In our `NadekoBot` folder you should have `.json` file named `credentials.json`. (Note: If you do not see a **.json** after `credentials.json `, do not add the `**.json**`. You most likely have `"Hide file extensions"` enabled.) - If you mess up the setup of `credentials.json`, rename `credentials_example.json` to `credentials.json`. - Open the file with your Text editor. @@ -121,7 +121,7 @@ Now time to move bot to background and to do that, press CTRL+B+D (this will dit - Copy your `Client ID` from your [Discord bot applications page.][DiscordApp] - Replace the `12345678` in this link `https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303` with your `Client ID`. - Your edited link should look like this: `https://discordapp.com/oauth2/authorize?client_id=**YOUR_CLENT_ID**&scope=bot&permissions=66186303`. -- Go to newly created link and pick the server we created, and click `Authorize`. +- Go to newly created link and pick the server, and click `Authorize`. - Bot should be added to your server. ####Setting NadekoBot Music From 5c1525c9564b1614d43978250dcf91bbb765b37e Mon Sep 17 00:00:00 2001 From: samvaio Date: Sun, 23 Oct 2016 23:18:30 +0530 Subject: [PATCH 4/9] Little more changes --- docs/guides/OSX Guide.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/guides/OSX Guide.md b/docs/guides/OSX Guide.md index 23b0df53..65e48643 100644 --- a/docs/guides/OSX Guide.md +++ b/docs/guides/OSX Guide.md @@ -32,7 +32,6 @@ brew install tmux - Download the .NET Core SDK, found [here.](https://go.microsoft.com/fwlink/?LinkID=827526) - Open the `.pkg` file you downloaded and install it. - `ln -s /usr/local/share/dotnet/dotnet /usr/local/bin` -- `dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json` ####Check your `FFMPEG` @@ -57,6 +56,7 @@ A dialog box will open asking if you want to install `xcode-select`. Select inst - `cd ~` - `git clone -b 1.0 --recursive https://github.com/Kwoth/NadekoBot.git` - `cd ~/NadekoBot/discord.net` +- `dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json` - `dotnet restore` - `cd ~/NadekoBot/src/NadekoBot/` - `dotnet restore` From 2ad34ccd0db43613e3f66c27937291ee3f8ed293 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 24 Oct 2016 05:09:26 +0530 Subject: [PATCH 5/9] =?UTF-8?q?Add=20Kwoth's=20Magic=20=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/guides/OSX Guide.md | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docs/guides/OSX Guide.md b/docs/guides/OSX Guide.md index 65e48643..f22885cf 100644 --- a/docs/guides/OSX Guide.md +++ b/docs/guides/OSX Guide.md @@ -53,6 +53,14 @@ Xcode command line tools. You will do this in Terminal.app by running the follow A dialog box will open asking if you want to install `xcode-select`. Select install and finish the installation. ####Downloading and building Nadeko + +**METHOD I** +- `cd ~` +- `curl -L https://github.com/Kwoth/NadekoBot-BashScript/raw/master/nadeko_installer.sh | sh` + +*If you fail to run the bot with* `METHOD I` *try:* + +**METHOD II** - `cd ~` - `git clone -b 1.0 --recursive https://github.com/Kwoth/NadekoBot.git` - `cd ~/NadekoBot/discord.net` @@ -112,7 +120,7 @@ If you want to use Screen, run: CHECK THE BOT IN DISCORD, IF EVERYTHING IS WORKING -Now time to move bot to background and to do that, press CTRL+B+D (this will ditach the nadeko session using TMUX) +Now time to move bot to background and to do that, press CTRL+B+D (this will detach the nadeko session using TMUX) *If you used Screen press CTRL+A+D (this will detach the nadeko screen)* From e05aca0e83b77f7538928aa2409724e3ca5bb050 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 24 Oct 2016 05:32:11 +0530 Subject: [PATCH 6/9] =?UTF-8?q?More=20Magic=20=E2=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/guides/Linux Guide.md | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 87775703..adf3e9c6 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -97,12 +97,26 @@ sudo apt-get update && sudo apt-get install ffmpeg -y` ####Getting NadekoBot **10)** +`cd ~` +`curl -L https://github.com/Kwoth/NadekoBot-BashScript/raw/master/nadeko_installer.sh | sh` +*Skip steps 10.5-11.5 and continue to run the bot, if you see errors while running, do the below steps again.* + +**10.5)** `cd ~ && git clone -b 1.0 --recursive https://github.com/Kwoth/NadekoBot.git` ####Building NadekoBot **11)** `cd ~/NadekoBot/ && dotnet restore && cd ~/NadekoBot/src/NadekoBot/ && dotnet build --configuration Release` +*if you see error, try:* + +**11.5)** +`cd ~/NadekoBot/discord.net` +`dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json` +`dotnet restore` +`cd ~/NadekoBot/src/NadekoBot/` +`dotnet restore` +`dotnet build --configuration Release` ####Setting up NadekoBot @@ -130,8 +144,7 @@ sudo apt-get update && sudo apt-get install ffmpeg -y` Go back to **PuTTY**, `(hope its still running xD)` **12)** -Type/ Copy and hit **Enter**. - +(Type or Copy and hit **Enter**) `tmux new -s nadeko` `cd NadekoBot/src/NadekoBot/` **^this will create a new session named “nadeko”** *(you can replace “nadeko” with anything you prefer and remember its your session name)* so you can run the bot in background without having to keep running PuTTY in the background. From 1e6ef2a7b4d79e050c86ca3e4d159bf42016cc2a Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 24 Oct 2016 05:39:27 +0530 Subject: [PATCH 7/9] Update Linux Guide.md --- docs/guides/Linux Guide.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index adf3e9c6..672dbd16 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -97,8 +97,8 @@ sudo apt-get update && sudo apt-get install ffmpeg -y` ####Getting NadekoBot **10)** -`cd ~` -`curl -L https://github.com/Kwoth/NadekoBot-BashScript/raw/master/nadeko_installer.sh | sh` +```cd ~ +curl -L https://github.com/Kwoth/NadekoBot-BashScript/raw/master/nadeko_installer.sh | sh``` *Skip steps 10.5-11.5 and continue to run the bot, if you see errors while running, do the below steps again.* **10.5)** @@ -111,12 +111,12 @@ sudo apt-get update && sudo apt-get install ffmpeg -y` *if you see error, try:* **11.5)** -`cd ~/NadekoBot/discord.net` -`dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json` -`dotnet restore` -`cd ~/NadekoBot/src/NadekoBot/` -`dotnet restore` -`dotnet build --configuration Release` +```cd ~/NadekoBot/discord.net +dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json +dotnet restore +cd ~/NadekoBot/src/NadekoBot/ +dotnet restore +dotnet build --configuration Release``` ####Setting up NadekoBot From cac89bf54e5d9c29276cc5200078d13750b1cce7 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 24 Oct 2016 05:41:04 +0530 Subject: [PATCH 8/9] Added few changes --- docs/guides/Linux Guide.md | 1 - 1 file changed, 1 deletion(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 672dbd16..89aff79f 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -144,7 +144,6 @@ dotnet build --configuration Release``` Go back to **PuTTY**, `(hope its still running xD)` **12)** -(Type or Copy and hit **Enter**) `tmux new -s nadeko` `cd NadekoBot/src/NadekoBot/` **^this will create a new session named “nadeko”** *(you can replace “nadeko” with anything you prefer and remember its your session name)* so you can run the bot in background without having to keep running PuTTY in the background. From 3c0829e40aa99c356ef95bb981849cb86958dad0 Mon Sep 17 00:00:00 2001 From: samvaio Date: Mon, 24 Oct 2016 05:48:49 +0530 Subject: [PATCH 9/9] Additions and Kwoth's Magic from Magical Girl Mirai Okay sorry for spamming pull requestm this will be the last one, off to bed Sam --- docs/guides/Linux Guide.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/docs/guides/Linux Guide.md b/docs/guides/Linux Guide.md index 89aff79f..7cb3049d 100644 --- a/docs/guides/Linux Guide.md +++ b/docs/guides/Linux Guide.md @@ -97,26 +97,26 @@ sudo apt-get update && sudo apt-get install ffmpeg -y` ####Getting NadekoBot **10)** -```cd ~ -curl -L https://github.com/Kwoth/NadekoBot-BashScript/raw/master/nadeko_installer.sh | sh``` +- `cd ~` +- `curl -L https://github.com/Kwoth/NadekoBot-BashScript/raw/master/nadeko_installer.sh | sh` *Skip steps 10.5-11.5 and continue to run the bot, if you see errors while running, do the below steps again.* **10.5)** -`cd ~ && git clone -b 1.0 --recursive https://github.com/Kwoth/NadekoBot.git` +- `cd ~ && git clone -b 1.0 --recursive https://github.com/Kwoth/NadekoBot.git` ####Building NadekoBot **11)** -`cd ~/NadekoBot/ && dotnet restore && cd ~/NadekoBot/src/NadekoBot/ && dotnet build --configuration Release` +- `cd ~/NadekoBot/ && dotnet restore && cd ~/NadekoBot/src/NadekoBot/ && dotnet build --configuration Release` *if you see error, try:* **11.5)** -```cd ~/NadekoBot/discord.net -dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json -dotnet restore -cd ~/NadekoBot/src/NadekoBot/ -dotnet restore -dotnet build --configuration Release``` +- `cd ~/NadekoBot/discord.net` +- `dotnet restore -s https://dotnet.myget.org/F/dotnet-core/api/v3/index.json` +- `dotnet restore` +- `cd ~/NadekoBot/src/NadekoBot/` +- `dotnet restore` +- `dotnet build --configuration Release` ####Setting up NadekoBot