Skip to content

Commit

Permalink
Merge pull request #13 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 1.4.2
  • Loading branch information
andyone authored Mar 14, 2018
2 parents 62041b7 + d7d9a5a commit 1205be4
Show file tree
Hide file tree
Showing 5 changed files with 72 additions and 29 deletions.
42 changes: 42 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Contributor Code of Conduct

As contributors and maintainers of this project, and in the interest of
fostering an open and welcoming community, we pledge to respect all people who
contribute through reporting issues, posting feature requests, updating
documentation, submitting pull requests or patches, and other activities.

We are committed to making participation in this project a harassment-free
experience for everyone, regardless of level of experience, gender, gender
identity and expression, sexual orientation, disability, personal appearance,
body size, race, ethnicity, age, religion, or nationality.

Examples of unacceptable behavior by participants include:

* The use of sexualized language or imagery
* Personal attacks
* Trolling or insulting/derogatory comments
* Public or private harassment
* Publishing other's private information, such as physical or electronic
addresses, without explicit permission
* Other unethical or unprofessional conduct

Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.

By adopting this Code of Conduct, project maintainers commit themselves to
fairly and consistently applying these principles to every aspect of managing
this project. Project maintainers who do not follow or enforce the Code of
Conduct may be permanently removed from the project team.

This Code of Conduct applies both within project spaces and in public spaces
when an individual is representing the project or its community.

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting a project maintainer at `[email protected]`. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. Maintainers are
obligated to maintain confidentiality with regard to the reporter of an
incident.
40 changes: 19 additions & 21 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
# Contributing Guidelines

Contributing guidelines for open-source EK projects.

**IMPORTANT! Contribute your code only if you have an excellent understanding of project idea and all existing code base. Otherwise, a nicely formatted issue will be more helpful to us.**

### Issues

1. Provide product version where the problem was found;
2. Provide info about your environment;
3. Provide detailed info about your problem;
4. Provide steps to reproduce the problem;
5. Provide actual and expected results.

### Code

1. Check your code **before** creating pull request;
2. If tests are present in a project, add tests for your code;
3. Add inline documentation for your code;
4. Apply code style used throughout the project;
5. Create your pull request to `develop` branch (_pull requests to other branches are not allowed_).
# Contributing Guidelines

**IMPORTANT! Contribute your code only if you have an excellent understanding of project idea and all existing code base. Otherwise, a nicely formatted issue will be more helpful to us.**

### Issues

1. Provide product version where the problem was found;
2. Provide info about your environment;
3. Provide detailed info about your problem;
4. Provide steps to reproduce the problem;
5. Provide actual and expected results.

### Code

1. Check your code **before** creating pull request;
2. If tests are present in a project, add tests for your code;
3. Add inline documentation for your code;
4. Apply code style used throughout the project;
5. Create your pull request to `develop` branch (_pull requests to other branches are not allowed_).
4 changes: 2 additions & 2 deletions SOURCES/webkaos-utils
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
APP="WEBKAOS Utils"

# Utility version
VER="1.4.1"
VER="1.4.2"

########################################################################################

Expand Down Expand Up @@ -380,7 +380,7 @@ sigExitTrap() {
doExit() {
local ec="${1:-0}"

rm -f "${TMP_PATTERN//XXXXXXXXX/}*"
rm -f ${TMP_PATTERN//XXXXXXXXX/}*

exit "$ec"
}
Expand Down
8 changes: 4 additions & 4 deletions readme.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
## `webkaos-utils` [![Build Status](https://travis-ci.org/essentialkaos/webkaos-utils.svg?branch=master)](https://travis-ci.org/essentialkaos/webkaos-utils) [![License](https://gh.kaos.io/ekol.svg)](https://essentialkaos.com/ekol)
## `webkaos-utils` [![Build Status](https://travis-ci.org/essentialkaos/webkaos-utils.svg?branch=master)](https://travis-ci.org/essentialkaos/webkaos-utils) [![License](https://gh.kaos.st/ekol.svg)](https://essentialkaos.com/ekol)

`webkaos-utils` is helpers for working with [webkaos](https://github.com/essentialkaos/webkaos) server.

Expand All @@ -7,14 +7,14 @@
#### From ESSENTIAL KAOS Public repo for RHEL6/CentOS6

```
[sudo] yum install -y https://yum.kaos.io/6/release/x86_64/kaos-repo-8.0-0.el6.noarch.rpm
[sudo] yum install -y https://yum.kaos.st/6/release/x86_64/kaos-repo-9.1-0.el6.noarch.rpm
[sudo] yum install webkaos-utils
```

#### From ESSENTIAL KAOS Public repo for RHEL7/CentOS7

```
[sudo] yum install -y https://yum.kaos.io/7/release/x86_64/kaos-repo-8.0-0.el7.noarch.rpm
[sudo] yum install -y https://yum.kaos.st/7/release/x86_64/kaos-repo-9.1-0.el7.noarch.rpm
[sudo] yum install webkaos-utils
```

Expand Down Expand Up @@ -69,4 +69,4 @@ Examples

[EKOL](https://essentialkaos.com/ekol)

<p align="center"><a href="https://essentialkaos.com"><img src="https://gh.kaos.io/ekgh.svg"/></a></p>
<p align="center"><a href="https://essentialkaos.com"><img src="https://gh.kaos.st/ekgh.svg"/></a></p>
7 changes: 5 additions & 2 deletions webkaos-utils.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

Summary: Helpers for working with webkaos server
Name: webkaos-utils
Version: 1.4.1
Version: 1.4.2
Release: 0%{?dist}
Group: Applications/System
License: EKOL
URL: https://github.com/essentialkaos/webkaos-utils

Source0: https://source.kaos.io/%{name}/%{name}-%{version}.tar.bz2
Source0: https://source.kaos.st/%{name}/%{name}-%{version}.tar.bz2

BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Expand Down Expand Up @@ -47,6 +47,9 @@ rm -rf %{buildroot}
###############################################################################

%changelog
* Wed Mar 14 2018 Anton Novojilov <[email protected]> - 1.4.2-0
- Fixed bug with cleaning temporary data

* Tue Dec 12 2017 Anton Novojilov <[email protected]> - 1.4.1-0
- Code refactoring

Expand Down

0 comments on commit 1205be4

Please sign in to comment.