Merge pull request #52 from essentialkaos/develop

Version 2.3.2
essentialkaos · Dec 12, 2024 · 5d71a06 · 5d71a06
2 parents 15d0780 + 5892865
commit 5d71a06
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
@@ -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: .
@@ -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: .

diff --git a/SOURCES/web-utils b/SOURCES/web-utils
@@ -13,7 +13,7 @@ fi
 APP="WEB Utils"
 
 # Utility version
-VER="2.3.1"
+VER="2.3.2"
 
 ################################################################################
 
@@ -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
@@ -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[@]}"
 
 ################################################################################
diff --git a/web-utils.spec b/web-utils.spec
@@ -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
@@ -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