Merge pull request #50 from essentialkaos/develop

Version 2.3.1

README.md

@@ -1,22 +1,22 @@
-<p align="center"><a href="#readme"><img src="https://gh.kaos.st/web-utils.svg"/></a></p>
+<p align="center"><a href="#readme"><img src=".github/images/card.svg"/></a></p>
 
 <p align="center">
   <a href="https://kaos.sh/w/web-utils/ci"><img src="https://kaos.sh/w/web-utils/ci.svg" alt="GitHub Actions CI Status" /></a>
-  <a href="#license"><img src="https://gh.kaos.st/apache2.svg"></a>
+  <a href="#license"><img src=".github/images/license.svg"/></a>
 </p>
 
-<p align="center"><a href="#installation">Installation</a> • <a href="#usage">Usage</a> • <a href="#build-status">Build Status</a> • <a href="#license">License</a></p>
+<p align="center"><a href="#installation">Installation</a> • <a href="#usage">Usage</a> • <a href="#ci-status">CI Status</a> • <a href="#license">License</a></p>
 
 <br/>
 
 `web-utils` is helpers for working with web server.
 
 ### Installation
 
-#### From ESSENTIAL KAOS Public repository
+#### From [ESSENTIAL KAOS Public Repository](https://kaos.sh/kaos-repo)
 
 ```
-sudo yum install -y https://yum.kaos.st/get/$(uname -r).rpm
+sudo yum install -y https://pkgs.kaos.st/kaos-repo-latest.el$(grep 'CPE_NAME' /etc/os-release | tr -d '"' | cut -d':' -f5).noarch.rpm
 sudo yum install web-utils
 ```
 
@@ -58,51 +58,9 @@ docker run --rm -it -v "$(pwd):/data" ghcr.io/essentialkaos/web-utils:latest # p
 
 ### Usage
 
-```
-Usage: web-utils command args…
-
-Commands
-
-┌ csr-gen host                        Generate key and a certificate signing request
-└ csr-gen config                      Generate key and a certificate signing request from OpenSSL configuration file
-  csr-info csr                        Print info from certificate signing request
-  csr-config-gen host                 Generate OpenSSL configuration file for certificate signing request generation
-  crt-info crt                        Print info from certificate
-┌ hpkp-gen csr backup                 Generate HTTP public key pinning (HPKP) header from CSR file
-│ hpkp-gen key backup                 Generate HTTP public key pinning (HPKP) header from KEY file
-└ hpkp-gen crt backup                 Generate HTTP public key pinning (HPKP) header from CRT file
-┌ ocsp-gen server-cert issuer-cert    Generate OCSP stapling file from server certificate
-└ ocsp-gen cert-chain                 Generate OCSP stapling file from server certificate chain
-  ocsp-check host server-name         Check OCSP response status for some host
-  0rtt-check host server-name         Check 0-RTT support
-  htpasswd user password              Generate record with MD5 password hash for .htpasswd files
-
-Options
-
-  --ecc, -E        Generate ECC certificate signing request
-  --size, -s size  Key size (ECC: 256-384 / RSA: 2048-8192)
-  --help, -h       Show this help message
-  --version, -v    Show information about version
-
-Examples
-
-  web-utils csr-gen domain.com
-  Generate RSA key and a certificate signing request for domain.com
-
-  web-utils hpkp-gen domain.com.csr domain.com.backup.key
-  Generate HTTP public key pinning (HPKP) header with server and backup pins
-
-  web-utils ocsp-gen sever.crt issuer.crt
-  Generate OCSP stapling file using server and issuer certificates
-
-  web-utils ocsp-gen sever-chain.crt
-  Generate OCSP stapling file using certificate chain
-
-  web-utils ocsp-check essentialkaos.com
-  Check OCSP response status for essentialkaos.com
-```
+<img src=".github/images/usage.svg" />
 
-### Build Status
+### CI Status
 
 | Branch | Status |
 |--------|--------|

SOURCES/web-utils

@@ -13,7 +13,7 @@ fi
 APP="WEB Utils"
 
 # Utility version
-VER="2.3.0"
+VER="2.3.1"
 
 ################################################################################
 
@@ -88,7 +88,7 @@ SHORT_OPTS="E:!ecc s:size h:!help v:!version nc:!no_color"
 # Code: No
 # Echo: No
 main() {
-  if [[ ! -c /dev/stdout || -n "$no_color" || -n "$NO_COLOR" ]] ; then
+  if [[ -n "$no_color" || -n "$NO_COLOR" ]] || [[ ! -c /dev/stdout && -z $FAKETTY ]] ; then
     unset NORM BOLD CL_ITLC UNLN RED GREEN YELLOW BLUE MAG CYAN GREY DARK
     unset CL_NORM CL_BOLD CL_UNLN CL_RED CL_GREEN CL_YELLOW CL_BLUE CL_MAG CL_CYAN CL_GREY CL_DARK
     unset CL_BL_RED CL_BL_GREEN CL_BL_YELLOW CL_BL_BLUE CL_BL_MAG CL_BL_CYAN CL_BL_GREY CL_IT_DARK

web-utils.spec

@@ -2,7 +2,7 @@
 
 Summary:    Helpers for working with web server
 Name:       web-utils
-Version:    2.3.0
+Version:    2.3.1
 Release:    0%{?dist}
 Group:      Applications/System
 License:    Apache License, Version 2.0
@@ -49,6 +49,9 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Sun Jun 09 2024 Anton Novojilov <[email protected]> - 2.3.1-0
+- Improved automatic disabling of color output usage
+
 * Thu Nov 30 2023 Anton Novojilov <[email protected]> - 2.3.0-0
 - Improved version output
 - Code refactoring