docs

README.md

@@ -29,12 +29,12 @@
 ### 使用方法
 * 可参考[wiki](https://github.com/moecube/srvpro/wiki)安装
 * 一键安装：
-  * CentOS 7 `curl -sL https://purerosefallen.github.io/ygopro-server/install_centos_7.sh | sudo -E bash -`
-  * CentOS 6 `curl -sL https://purerosefallen.github.io/ygopro-server/install_centos_6.sh | sudo -E bash -`
-  * Ubnutu 18 `curl -sL https://purerosefallen.github.io/ygopro-server/install_ubuntu_18.sh | sudo -E bash  -`
-  * Ubnutu 16 `curl -sL https://purerosefallen.github.io/ygopro-server/install_ubuntu_16.sh | sudo -E bash  -`
-  * Ubnutu 14 `curl -sL https://purerosefallen.github.io/ygopro-server/install_ubuntu_14.sh | sudo -E bash  -`
-  * 更新数据 `curl -sL https://purerosefallen.github.io/ygopro-server/update.sh | sudo -E bash -`
+  * CentOS 7 `curl -sL https://purerosefallen.github.io/ygopro-server/install_centos_7.sh | bash -`
+  * CentOS 6 `curl -sL https://purerosefallen.github.io/ygopro-server/install_centos_6.sh | bash -`
+  * Ubnutu 18 `curl -sL https://purerosefallen.github.io/ygopro-server/install_ubuntu_18.sh | bash  -`
+  * Ubnutu 16 `curl -sL https://purerosefallen.github.io/ygopro-server/install_ubuntu_16.sh | bash  -`
+  * Ubnutu 14 `curl -sL https://purerosefallen.github.io/ygopro-server/install_ubuntu_14.sh | bash  -`
+  * 更新数据 `curl -sL https://purerosefallen.github.io/ygopro-server/update.sh | bash -`
 * 手动安装：
   * `git clone https://github.com/moecube/srvpro.git`
   * `cd srvpro`

docs/install_centos_6.sh

 #!/bin/bash
 
-# install script for CentOS 7
+export PROCESS_COUNT=$(grep -c "processor" /proc/cpuinfo)
 
-sudo yum install epel-release yum-utils -y
+sudo yum install epel-release yum-utils curl wget -y
 sudo rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
 curl https://download.mono-project.com/repo/centos6-stable.repo | sudo tee /etc/yum.repos.d/mono-centos6-stable.repo
 curl --silent --location https://rpm.nodesource.com/setup_10.x | sudo bash -
-sudo yum update -y
-sudo yum install -y nodejs git gcc gcc-c++ sqlite-devel readline-devel openssl-devel wget mono-complete firewalld
+sudo yum install nodejs git gcc gcc-c++ sqlite-devel readline-devel openssl-devel mono-complete -y
 sudo npm install pm2 -g
 
-sudo systemctl start firewalld
-sudo firewall-cmd --zone=public --permanent --add-port=22/tcp
-sudo firewall-cmd --zone=public --permanent --add-port=7210-7219/tcp
-sudo firewall-cmd --reload
-
 mkdir lib
 cd lib
 
-wget https://nchc.dl.sourceforge.net/project/p7zip/p7zip/16.02/p7zip_16.02_src_all.tar.bz2 --no-check-certificate
-tar jxvf p7zip_16.02_src_all.tar.bz2
-cd p7zip_16.02
-sudo make all3 install
-cd ..
-
 wget http://download.redis.io/releases/redis-stable.tar.gz --no-check-certificate
 tar xzfv redis-stable.tar.gz
 cd redis-stable
-make
+make -j$PROCESS_COUNT
 sudo make install
 sudo cp -rf src/redis-server /usr/bin/
 cd ..
-pm2 start redis-server
 
 wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -
 cp -rf premake5 ~
@@ -40,7 +27,7 @@ wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stab
 tar xf libevent-2.0.22-stable.tar.gz
 cd libevent-2.0.22-stable/
 ./configure
-make
+make -j$PROCESS_COUNT
 sudo make install
 sudo ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib/libevent-2.0.so.5
 sudo ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib64/libevent-2.0.so.5
@@ -50,22 +37,15 @@ cd ..
 
 cd ..
 
-git clone https://github.com/purerosefallen/ygopro-server ygopro-server
-cd ygopro-server
-npm install
-cp -rf config_build config
-mkdir decks decks_save replays
-
 git clone https://github.com/purerosefallen/ygopro --branch=server --recursive
 cd ygopro/
 git submodule foreach git checkout master
 ~/premake5 gmake
 cd build/
-make config=release
+make config=release -j$PROCESS_COUNT
 cd ..
 ln -s bin/release/ygopro ./
 strip ygopro
-mkdir replay
 cd ..
 
 git clone https://github.com/purerosefallen/windbot
@@ -73,12 +53,13 @@ cd windbot
 xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 ln -s bin/Release/WindBot.exe .
 ln -s ../ygopro/cards.cdb .
-pm2 start pm2.json
 cd ..
 
-pm2 start ygopro-server.js
-pm2 start ygopro-webhook.js
-pm2 start restart.js
-
-pm2 save
-pm2 startup
+git clone https://github.com/purerosefallen/ygopro-server
+cd ygopro-server
+npm install
+ln -s ../ygopro .
+ln -s ../windbot .
+mkdir config
+cp data/default_config.json config/config.json
+cd ..

docs/install_centos_7.sh

 #!/bin/bash
 
-# install script for CentOS 7
+export PROCESS_COUNT=$(grep -c "processor" /proc/cpuinfo)
 
-sudo yum install epel-release yum-utils -y
+sudo yum install epel-release yum-utils curl wget -y
 sudo rpm --import "http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF"
 curl https://download.mono-project.com/repo/centos7-stable.repo | sudo tee /etc/yum.repos.d/mono-centos7-stable.repo
 curl --silent --location https://rpm.nodesource.com/setup_10.x | sudo bash -
-sudo yum update -y
-sudo yum install -y nodejs git gcc gcc-c++ sqlite-devel readline-devel openssl-devel wget mono-complete firewalld
+sudo yum install nodejs git gcc gcc-c++ sqlite-devel readline-devel openssl-devel mono-complete -y
 sudo npm install pm2 -g
 
-sudo systemctl start firewalld
-sudo firewall-cmd --zone=public --permanent --add-port=22/tcp
-sudo firewall-cmd --zone=public --permanent --add-port=7210-7219/tcp
-sudo firewall-cmd --reload
-
 mkdir lib
 cd lib
 
-wget https://nchc.dl.sourceforge.net/project/p7zip/p7zip/16.02/p7zip_16.02_src_all.tar.bz2 --no-check-certificate
-tar jxvf p7zip_16.02_src_all.tar.bz2
-cd p7zip_16.02
-sudo make all3 install
-cd ..
-
 wget http://download.redis.io/releases/redis-stable.tar.gz --no-check-certificate
 tar xzfv redis-stable.tar.gz
 cd redis-stable
-make
+make -j$PROCESS_COUNT
 sudo make install
 sudo cp -rf src/redis-server /usr/bin/
 cd ..
-pm2 start redis-server
 
 wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -
 cp -rf premake5 ~
@@ -40,7 +27,7 @@ wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stab
 tar xf libevent-2.0.22-stable.tar.gz
 cd libevent-2.0.22-stable/
 ./configure
-make
+make -j$PROCESS_COUNT
 sudo make install
 sudo ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib/libevent-2.0.so.5
 sudo ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib64/libevent-2.0.so.5
@@ -50,22 +37,15 @@ cd ..
 
 cd ..
 
-git clone https://github.com/purerosefallen/ygopro-server ygopro-server
-cd ygopro-server
-npm install
-cp -rf config_build config
-mkdir decks decks_save replays
-
 git clone https://github.com/purerosefallen/ygopro --branch=server --recursive
 cd ygopro/
 git submodule foreach git checkout master
 ~/premake5 gmake
 cd build/
-make config=release
+make config=release -j$PROCESS_COUNT
 cd ..
 ln -s bin/release/ygopro ./
 strip ygopro
-mkdir replay
 cd ..
 
 git clone https://github.com/purerosefallen/windbot
@@ -73,12 +53,14 @@ cd windbot
 xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 ln -s bin/Release/WindBot.exe .
 ln -s ../ygopro/cards.cdb .
-pm2 start pm2.json
 cd ..
 
-pm2 start ygopro-server.js
-pm2 start ygopro-webhook.js
-pm2 start restart.js
+git clone https://github.com/purerosefallen/ygopro-server
+cd ygopro-server
+npm install
+ln -s ../ygopro .
+ln -s ../windbot .
+mkdir config
+cp data/default_config.json config/config.json
+cd ..
 
-pm2 save
-pm2 startup

docs/install_ubuntu_14.sh

 #!/bin/bash
 
-# install script for Ubnutu 16
+export PROCESS_COUNT=$(grep -c "processor" /proc/cpuinfo)
 
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-sudo apt-get install -y apt-transport-https
+sudo apt-get install -y apt-transport-https curl wget
 echo "deb http://download.mono-project.com/repo/ubuntu stable-trusty main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
 curl -sL https://deb.nodesource.com/setup_10.x | sudo bash -
-sudo apt-get upgrade -y
-sudo apt-get install -y curl git build-essential libreadline-dev libsqlite3-dev mono-complete nodejs firewalld
+sudo apt-get install -y git build-essential libreadline-dev libsqlite3-dev libevent-dev mono-complete nodejs
 sudo npm install pm2 -g
 
-sudo systemctl start firewalld
-sudo firewall-cmd --zone=public --permanent --add-port=22/tcp
-sudo firewall-cmd --zone=public --permanent --add-port=7210-7219/tcp
-sudo firewall-cmd --reload
-
 mkdir lib
 cd lib
 
-wget https://nchc.dl.sourceforge.net/project/p7zip/p7zip/16.02/p7zip_16.02_src_all.tar.bz2 --no-check-certificate
-tar jxvf p7zip_16.02_src_all.tar.bz2
-cd p7zip_16.02
-sudo make all3 install
-cd ..
-
 wget http://download.redis.io/releases/redis-stable.tar.gz --no-check-certificate
 tar xzfv redis-stable.tar.gz
 cd redis-stable
-make
+make -j$PROCESS_COUNT
 sudo make install
 sudo cp -rf src/redis-server /usr/bin/
 cd ..
-pm2 start redis-server
 
 wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -
 cp -rf premake5 ~
 
-wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' -O libevent-2.0.22-stable.tar.gz --no-check-certificate
-tar xf libevent-2.0.22-stable.tar.gz
-cd libevent-2.0.22-stable/
-./configure
-make
-sudo make install
-sudo ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib/libevent-2.0.so.5
-sudo ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib64/libevent-2.0.so.5
-sudo ln -s /usr/local/lib/libevent_pthreads-2.0.so.5 /usr/lib/libevent_pthreads-2.0.so.5
-sudo ln -s /usr/local/lib/libevent_pthreads-2.0.so.5 /usr/lib64/libevent_pthreads-2.0.so.5
-cd ..
-
 cd ..
 
-git clone https://github.com/purerosefallen/ygopro-server ygopro-server
-cd ygopro-server
-npm install
-cp -rf config_build config
-mkdir decks decks_save replays
-
 git clone https://github.com/purerosefallen/ygopro --branch=server --recursive
 cd ygopro/
 git submodule foreach git checkout master
 ~/premake5 gmake
+git checkout -f
+git submodule foreach git checkout -f
 cd build/
-make config=release
+make config=release -j$PROCESS_COUNT
 cd ..
 ln -s bin/release/ygopro ./
 strip ygopro
-mkdir replay
 cd ..
 
 git clone https://github.com/purerosefallen/windbot
@@ -73,12 +43,14 @@ cd windbot
 xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 ln -s bin/Release/WindBot.exe .
 ln -s ../ygopro/cards.cdb .
-pm2 start pm2.json
 cd ..
 
-pm2 start ygopro-server.js
-pm2 start ygopro-webhook.js
-pm2 start restart.js
+git clone https://github.com/purerosefallen/ygopro-server
+cd ygopro-server
+npm install
+ln -s ../ygopro .
+ln -s ../windbot .
+mkdir config
+cp data/default_config.json config/config.json
+cd ..
 
-pm2 save
-pm2 startup

docs/install_ubuntu_16.sh

 #!/bin/bash
 
-# install script for Ubnutu 16
+export PROCESS_COUNT=$(grep -c "processor" /proc/cpuinfo)
 
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-sudo apt-get install -y apt-transport-https
+sudo apt-get install -y apt-transport-https curl wget
 echo "deb http://download.mono-project.com/repo/ubuntu stable-xenial main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
 curl -sL https://deb.nodesource.com/setup_10.x | sudo bash -
-sudo apt-get upgrade -y
-sudo apt-get install -y curl git build-essential libreadline-dev libsqlite3-dev mono-complete nodejs firewalld
+sudo apt-get install -y git build-essential libreadline-dev libsqlite3-dev libevent-dev mono-complete nodejs
 sudo npm install pm2 -g
 
-sudo systemctl start firewalld
-sudo firewall-cmd --zone=public --permanent --add-port=22/tcp
-sudo firewall-cmd --zone=public --permanent --add-port=7210-7219/tcp
-sudo firewall-cmd --reload
-
 mkdir lib
 cd lib
 
-wget https://nchc.dl.sourceforge.net/project/p7zip/p7zip/16.02/p7zip_16.02_src_all.tar.bz2 --no-check-certificate
-tar jxvf p7zip_16.02_src_all.tar.bz2
-cd p7zip_16.02
-sudo make all3 install
-cd ..
-
 wget http://download.redis.io/releases/redis-stable.tar.gz --no-check-certificate
 tar xzfv redis-stable.tar.gz
 cd redis-stable
-make
+make -j$PROCESS_COUNT
 sudo make install
 sudo cp -rf src/redis-server /usr/bin/
 cd ..
-pm2 start redis-server
 
 wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -
 cp -rf premake5 ~
 
-wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stable/libevent-2.0.22-stable.tar.gz' -O libevent-2.0.22-stable.tar.gz --no-check-certificate
-tar xf libevent-2.0.22-stable.tar.gz
-cd libevent-2.0.22-stable/
-./configure
-make
-sudo make install
-sudo ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib/libevent-2.0.so.5
-sudo ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib64/libevent-2.0.so.5
-sudo ln -s /usr/local/lib/libevent_pthreads-2.0.so.5 /usr/lib/libevent_pthreads-2.0.so.5
-sudo ln -s /usr/local/lib/libevent_pthreads-2.0.so.5 /usr/lib64/libevent_pthreads-2.0.so.5
 cd ..
 
-cd ..
-
-git clone https://github.com/purerosefallen/ygopro-server ygopro-server
-cd ygopro-server
-npm install
-cp -rf config_build config
-mkdir decks decks_save replays
-
 git clone https://github.com/purerosefallen/ygopro --branch=server --recursive
 cd ygopro/
 git submodule foreach git checkout master
 ~/premake5 gmake
 cd build/
-make config=release
+make config=release -j$PROCESS_COUNT
 cd ..
 ln -s bin/release/ygopro ./
 strip ygopro
-mkdir replay
 cd ..
 
 git clone https://github.com/purerosefallen/windbot
@@ -73,12 +41,13 @@ cd windbot
 xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 ln -s bin/Release/WindBot.exe .
 ln -s ../ygopro/cards.cdb .
-pm2 start pm2.json
 cd ..
 
-pm2 start ygopro-server.js
-pm2 start ygopro-webhook.js
-pm2 start restart.js
-
-pm2 save
-pm2 startup
+git clone https://github.com/purerosefallen/ygopro-server
+cd ygopro-server
+npm install
+ln -s ../ygopro .
+ln -s ../windbot .
+mkdir config
+cp data/default_config.json config/config.json
+cd ..

docs/install_ubuntu_18.sh

 #!/bin/bash
 
-# install script for Ubnutu 16
+export PROCESS_COUNT=$(grep -c "processor" /proc/cpuinfo)
 
 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+sudo apt-get install -y curl wget
 echo "deb http://download.mono-project.com/repo/ubuntu stable-bionic main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
 curl -sL https://deb.nodesource.com/setup_10.x | sudo bash -
-sudo apt-get upgrade -y
-sudo apt-get install -y curl git build-essential libreadline-dev libsqlite3-dev mono-devel nodejs firewalld
+sudo apt-get install -y git build-essential libreadline-dev libsqlite3-dev libssl1.0-dev mono-complete nodejs
 sudo npm install pm2 -g
 
-sudo systemctl start firewalld
-sudo firewall-cmd --zone=public --permanent --add-port=22/tcp
-sudo firewall-cmd --zone=public --permanent --add-port=7210-7219/tcp
-sudo firewall-cmd --reload
-
 mkdir lib
 cd lib
 
-wget https://nchc.dl.sourceforge.net/project/p7zip/p7zip/16.02/p7zip_16.02_src_all.tar.bz2 --no-check-certificate
-tar jxvf p7zip_16.02_src_all.tar.bz2
-cd p7zip_16.02
-sudo make all3 install
-cd ..
-
 wget http://download.redis.io/releases/redis-stable.tar.gz --no-check-certificate
 tar xzfv redis-stable.tar.gz
 cd redis-stable
-make
+make -j$PROCESS_COUNT
 sudo make install
 sudo cp -rf src/redis-server /usr/bin/
 cd ..
-pm2 start redis-server
 
 wget -O - https://github.com/premake/premake-core/releases/download/v5.0.0-alpha13/premake-5.0.0-alpha13-linux.tar.gz | tar zfx -
 cp -rf premake5 ~
@@ -39,7 +27,7 @@ wget 'https://github.com/libevent/libevent/releases/download/release-2.0.22-stab
 tar xf libevent-2.0.22-stable.tar.gz
 cd libevent-2.0.22-stable/
 ./configure
-make
+make -j$PROCESS_COUNT
 sudo make install
 sudo ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib/libevent-2.0.so.5
 sudo ln -s /usr/local/lib/libevent-2.0.so.5 /usr/lib64/libevent-2.0.so.5
@@ -49,22 +37,15 @@ cd ..
 
 cd ..
 
-git clone https://github.com/purerosefallen/ygopro-server ygopro-server
-cd ygopro-server
-npm install
-cp -rf config_build config
-mkdir decks decks_save replays
-
 git clone https://github.com/purerosefallen/ygopro --branch=server --recursive
 cd ygopro/
 git submodule foreach git checkout master
-~/~/premake5 gmake
+~/premake5 gmake
 cd build/
-make config=release
+make config=release -j$PROCESS_COUNT
 cd ..
 ln -s bin/release/ygopro ./
 strip ygopro
-mkdir replay
 cd ..
 
 git clone https://github.com/purerosefallen/windbot
@@ -72,12 +53,14 @@ cd windbot
 xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 ln -s bin/Release/WindBot.exe .
 ln -s ../ygopro/cards.cdb .
-pm2 start pm2.json
 cd ..
 
-pm2 start ygopro-server.js
-pm2 start ygopro-webhook.js
-pm2 start restart.js
+git clone https://github.com/purerosefallen/ygopro-server
+cd ygopro-server
+npm install
+ln -s ../ygopro .
+ln -s ../windbot .
+mkdir config
+cp data/default_config.json config/config.json
+cd ..
 
-pm2 save
-pm2 startup

docs/update.sh

@@ -2,16 +2,16 @@
 
 # update script
 
-git pull origin master
+git fetch origin master
 git reset --hard FETCH_HEAD
 cd windbot
-git pull origin master
+git fetch origin master
 git reset --hard FETCH_HEAD
 echo y | xbuild /property:Configuration=Release /property:TargetFrameworkVersion="v4.5"
 cd ../ygopro
 git pull origin server
 git reset --hard FETCH_HEAD
-git submodule foreach git pull origin master
+git submodule foreach git fetch origin master
 git submodule foreach git reset --hard FETCH_HEAD
 ~/premake5 gmake
 cd build