Skip to content

Commit

Permalink
Merge pull request #3754 from PeterDaveHello/remove-trailing-space
Browse files Browse the repository at this point in the history
fix: remove trailing spaces
  • Loading branch information
wallet77 authored Jul 4, 2018
2 parents ca968cf + 5c11598 commit b660f03
Show file tree
Hide file tree
Showing 17 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ pipeline:
- ./packager/publish_deb_rpm.sh
secrets: ['packagecloud_token']
when:
event: tag
event: tag
build_apk:
group: build
image: keymetrics/alpine-pm2-builder:latest
environment:
- AWS_REPO_BUCKET=alpine-apk.pm2.io
secrets: ['apk_rsa_priv_key', 'apk_rsa_pub_key', 'aws_access_key_id', 'aws_secret_access_key']
when:
event: tag
event: tag
8 changes: 4 additions & 4 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ We 'd like to keep our master branch as clean as possible, please avoid PRs on m

## Fire an issue

When you got an issue by using pm2, you will fire an issue on [github](https://github.com/Unitech/pm2). We'll be glad to help or to fix it but the more data you give the most fast it would be resolved.
When you got an issue by using pm2, you will fire an issue on [github](https://github.com/Unitech/pm2). We'll be glad to help or to fix it but the more data you give the most fast it would be resolved.
Please try following these rules it will make the task easier for you and for us:

#### 1. Search through issues if it hasn't been resolved yet
#### 2. Make sure that you provide following informations:
#### 2. Make sure that you provide following informations:
- pm2 version `pm2 --version`
- nodejs version `node --version`
- operating system
Expand All @@ -27,7 +27,7 @@ Please try following these rules it will make the task easier for you and for us
- How may I reproduce this? (this isn't easy in some cases)
- Are you using a cluster module? Are you trying to catch SIGTERM signals? With `code` if possible.

#### 4. Think global
#### 4. Think global
If your issue is too specific we might not be able to help and stackoverflow might be a better place to seak for an answer

#### 5. Be clear and format issues with [markdown](http://daringfireball.net/projects/markdown/)
Expand All @@ -37,4 +37,4 @@ Note that we might understand english, german and french but english is prefered

```DEBUG=pm2:* PM2_DEBUG=true ./bin/pm2 --no-daemon start my-buggy-thing.js```

If your issue is flagged as `need data` be sure that there won't be any upgrade unless we can have enough data to reproduce.
If your issue is flagged as `need data` be sure that there won't be any upgrade unless we can have enough data to reproduce.
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,8 @@ npm install git-changelog -g

### usage

Edit .changelogrc
Change "version_name" to the next version to release (example 1.1.2).
Edit .changelogrc
Change "version_name" to the next version to release (example 1.1.2).
Change "tag" to the latest existing tag (example 1.1.1).

Run the following command into pm2 directory
Expand Down
4 changes: 2 additions & 2 deletions changelogTemplate.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<% if(logo) { %><img width="710px" src="<%= logo %>" alt="pm2 logo" /> <% } %>
<% if(logo) { %># <%= title %> <% } %>
<% if(intro) { %><%= '\n' %><%= intro %><%= '\n' %><% } %>
<% if(intro) { %><%= '\n' %><%= intro %><%= '\n' %><% } %>
<% if(version && (version.name || version.number)) { %>##<% if(version.name){%> <%= version.name %><% } %> <% if(version.date){ %>( <%= version.date %> )<% } %><%= '\n' %><% } %>
<% _.forEach(sections, function(section){
<% _.forEach(sections, function(section){
if(section.commitsCount > 0) { %>
## <%= section.title %>
<% _.forEach(section.commits, function(commit){ %> - <%= printCommit(commit, true) %><% }) %>
Expand Down
2 changes: 1 addition & 1 deletion examples/misc-examples/apps/killfast.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"min_uptime" : "100",
"max_restarts" : "400",
"max_restarts" : "400",
"name" : "auto-kill",
"script" : "./examples/killfast.js"
}
2 changes: 1 addition & 1 deletion examples/misc-examples/exit.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

// process.on('exit', function() {
// process.on('exit', function() {
// console.log('About to exit.');
// });

Expand Down
Binary file modified examples/start-a-binary/ls
Binary file not shown.
2 changes: 1 addition & 1 deletion lib/completion.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ exports.complete = function complete(name, completer, cb) {
// Really, one should not be tossing away EPIPE errors, or any
// errors, so casually. But, without this, `. <(npm completion)`
// can never ever work on OS X.
// -- isaacs
// -- isaacs
// https://github.com/isaacs/npm/blob/master/lib/completion.js#L162
if (er.errno === "EPIPE") er = null
cb(er, null, content);
Expand Down
4 changes: 2 additions & 2 deletions lib/tools/xdg-open
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ detectDE()
DE=gnome;
;;
LXDE|Lubuntu)
DE=lxde;
DE=lxde;
;;
MATE)
DE=mate;
Expand All @@ -428,7 +428,7 @@ detectDE()

if [ x"$DE" = x"" ]; then
# fallback to uname output for other platforms
case "$(uname 2>/dev/null)" in
case "$(uname 2>/dev/null)" in
Darwin)
DE=darwin;
;;
Expand Down
4 changes: 2 additions & 2 deletions packager/setup.deb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ REPOSITORY_OWNER="Keymetrics"

show_banner ()
{
echo
echo
echo "__/\\\\\\\\\\\\\\\\\\\\\\\\\\____/\\\\\\\\____________/\\\\\\\\____/\\\\\\\\\\\\\\\\\\_____"
echo " _\\/\\\\\\/////////\\\\\\_\\/\\\\\\\\\\\\________/\\\\\\\\\\\\__/\\\\\\///////\\\\\\___"
echo " _\\/\\\\\\_______\\/\\\\\\_\\/\\\\\\//\\\\\\____/\\\\\\//\\\\\\_\\///______\\//\\\\\\__"
Expand Down Expand Up @@ -209,7 +209,7 @@ main ()
if [ "$CURR_USER" == "" ]; then
CURR_USER=$USER
fi

if [ "$CURR_USER" == "root" ] || [ "$CURR_USER" == "" ]; then
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo "WARNING: You are either running this script as root or the"
Expand Down
8 changes: 4 additions & 4 deletions packager/setup.rpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ REPOSITORY_OWNER="Keymetrics"

show_banner ()
{
echo
echo
echo "__/\\\\\\\\\\\\\\\\\\\\\\\\\\____/\\\\\\\\____________/\\\\\\\\____/\\\\\\\\\\\\\\\\\\_____"
echo " _\\/\\\\\\/////////\\\\\\_\\/\\\\\\\\\\\\________/\\\\\\\\\\\\__/\\\\\\///////\\\\\\___"
echo " _\\/\\\\\\_______\\/\\\\\\_\\/\\\\\\//\\\\\\____/\\\\\\//\\\\\\_\\///______\\//\\\\\\__"
Expand Down Expand Up @@ -158,7 +158,7 @@ install_pm2 ()
if [ "$CURR_USER" == "" ]; then
CURR_USER=$USER
fi

if [ "$CURR_USER" == "root" ] || [ "$CURR_USER" == "" ]; then
echo "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
echo "WARNING: You are either running this script as root or the"
Expand All @@ -171,7 +171,7 @@ install_pm2 ()
echo -n "Adding $CURR_USER to group pm2..."
usermod -aG pm2 $CURR_USER
echo "done."
fi
fi
}

main ()
Expand All @@ -188,7 +188,7 @@ main ()
yum_repo_path=/etc/yum.repos.d/Keymetrics_pm2.repo
install_node
fi

echo "Downloading repository file: ${yum_repo_config_url}"

curl -sSf "${yum_repo_config_url}" > $yum_repo_path
Expand Down
2 changes: 1 addition & 1 deletion test/benchmarks/monit.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export RESULT_FILE=$RESULT_FILE

launch() {
echo "========= `date`" >> $RESULT_FILE
nohup ./monit-daemon.sh &> monit.log &
nohup ./monit-daemon.sh &> monit.log &
}

ppkill() {
Expand Down
2 changes: 1 addition & 1 deletion test/fixtures/args.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ if (process.argv.indexOf('-d') == -1 || process.argv.indexOf('-a') == -1) {
} else {
setInterval(function() {
console.log('ok');
}, 500);
}, 500);
}
Binary file modified test/fixtures/git/index
Binary file not shown.
2 changes: 1 addition & 1 deletion test/fixtures/mjs/ecosystem.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {

apps : [


Expand Down
4 changes: 2 additions & 2 deletions test/helpers/plan.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ var assert = require('assert');
* @method Plan
* @param {} count
* @param {} done
* @return
* @return
*/
function Plan(count, done) {
this.done = done;
Expand All @@ -17,7 +17,7 @@ function Plan(count, done) {
* Description
* @method ok
* @param {} expression
* @return
* @return
*/
Plan.prototype.ok = function(expression) {
assert(expression);
Expand Down
2 changes: 1 addition & 1 deletion test/programmatic/misc_commands.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ describe('Misc commands', function() {
should(err).be.null();
done();
});
});
});

it('should restart them', function(done) {
pm2.restart('all', function(err, data) {
Expand Down

0 comments on commit b660f03

Please sign in to comment.