Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version 2.3.2 #52

Merged
merged 4 commits into from
Dec 12, 2024
+11 −8
Merged

Version 2.3.2 #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f311703
Bump docker/build-push-action from 5 to 6
dependabot[bot] Jun 18, 2024
86e81da
Merge pull request #51 from essentialkaos/dependabot/github_actions/d…
andyone Jun 18, 2024
cb0b3c7
Improve options parsing
andyone Dec 5, 2024
5892865
Merge branch 'develop' of github.com:essentialkaos/web-utils into dev…
andyone Dec 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/docker-push.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ jobs:

- name: Build and push Docker images (Docker)
if: ${{ steps.build_check.outputs.build == 'true' }}
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
push: true
context: .
Expand All @@ -148,7 +148,7 @@ jobs:

- name: Build and push Docker images (GHCR)
if: ${{ steps.build_check.outputs.build == 'true' }}
uses: docker/build-push-action@v5
uses: docker/build-push-action@v6
with:
push: true
context: .
Expand Down
10 changes: 5 additions & 5 deletions SOURCES/web-utils
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fi
APP="WEB Utils"

# Utility version
VER="2.3.1"
VER="2.3.2"

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

Expand Down Expand Up @@ -968,15 +968,15 @@ showOptWarn() {
exit 1
}

## OPTIONS PARSING 5 ###########################################################
## OPTIONS PARSING 6 ###########################################################

if [[ $# -eq 0 ]] ; then
main
fi

unset opt optn optm optv optt optk

optv="$*" ; optt=""
optv="$*" ; optt=()

while [[ -n "$1" ]] ; do
if [[ "$1" =~ \ && -n "$optn" ]] ; then
Expand Down Expand Up @@ -1066,14 +1066,14 @@ while [[ -n "$1" ]] ; do
fi
fi

optt="$optt $1" ; shift
optt+=("$1") ; shift
done

[[ -n "$optn" ]] && declare "$optn=true"

unset opt optn optm optk

# shellcheck disable=SC2015,SC2086
[[ -n "$KEEP_OPTS" ]] && main $optv || main ${optt:1}
[[ -n "$KEEP_OPTS" ]] && main $optv || main "${optt[@]}"

################################################################################
5 changes: 4 additions & 1 deletion web-utils.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Summary: Helpers for working with web server
Name: web-utils
Version: 2.3.1
Version: 2.3.2
Release: 0%{?dist}
Group: Applications/System
License: Apache License, Version 2.0
Expand Down Expand Up @@ -49,6 +49,9 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Fri Dec 06 2024 Anton Novojilov <[email protected]> - 2.3.2-0
- Improved options parsing

* Sun Jun 09 2024 Anton Novojilov <[email protected]> - 2.3.1-0
- Improved automatic disabling of color output usage

Expand Down
Loading