From 842b61b69bea80e8cb43090da2d4b1e9a01c4511 Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Sat, 23 Dec 2017 22:47:15 +0100 Subject: [PATCH 1/3] Added code of conduct --- .github/CODE_OF_CONDUCT.md | 42 ++++++++++++++++++++++++++++++++++++++ .github/CONTRIBUTING.md | 40 +++++++++++++++++------------------- 2 files changed, 61 insertions(+), 21 deletions(-) create mode 100644 .github/CODE_OF_CONDUCT.md diff --git a/.github/CODE_OF_CONDUCT.md b/.github/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..45abf3d --- /dev/null +++ b/.github/CODE_OF_CONDUCT.md @@ -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 `conduct@essentialkaos.com`. 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. diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2a651a3..d7da3fb 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -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_). From 05bd37a23880de0e3ef34d171a08e8cfcbf9e1ab Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 14 Mar 2018 02:46:53 +0300 Subject: [PATCH 2/3] Fix bug with cleaning temporary data --- SOURCES/webkaos-utils | 4 ++-- webkaos-utils.spec | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/SOURCES/webkaos-utils b/SOURCES/webkaos-utils index 373f951..92a7447 100755 --- a/SOURCES/webkaos-utils +++ b/SOURCES/webkaos-utils @@ -7,7 +7,7 @@ APP="WEBKAOS Utils" # Utility version -VER="1.4.1" +VER="1.4.2" ######################################################################################## @@ -380,7 +380,7 @@ sigExitTrap() { doExit() { local ec="${1:-0}" - rm -f "${TMP_PATTERN//XXXXXXXXX/}*" + rm -f ${TMP_PATTERN//XXXXXXXXX/}* exit "$ec" } diff --git a/webkaos-utils.spec b/webkaos-utils.spec index 00b7326..f594e1d 100644 --- a/webkaos-utils.spec +++ b/webkaos-utils.spec @@ -2,7 +2,7 @@ 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 @@ -47,6 +47,9 @@ rm -rf %{buildroot} ############################################################################### %changelog +* Wed Mar 14 2018 Anton Novojilov - 1.4.2-0 +- Fixed bug with cleaning temporary data + * Tue Dec 12 2017 Anton Novojilov - 1.4.1-0 - Code refactoring From d7d9a5a06b507bf78e360e6077625298e726788c Mon Sep 17 00:00:00 2001 From: Anton Novojilov Date: Wed, 14 Mar 2018 12:21:55 +0300 Subject: [PATCH 3/3] Minor fixes --- readme.md | 8 ++++---- webkaos-utils.spec | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/readme.md b/readme.md index 91d0a15..1c60be8 100644 --- a/readme.md +++ b/readme.md @@ -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. @@ -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 ``` @@ -69,4 +69,4 @@ Examples [EKOL](https://essentialkaos.com/ekol) -

+

diff --git a/webkaos-utils.spec b/webkaos-utils.spec index f594e1d..ef22883 100644 --- a/webkaos-utils.spec +++ b/webkaos-utils.spec @@ -8,7 +8,7 @@ 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)