Skip to content

Commit

Permalink
Merge pull request #108 from essentialkaos/develop
Browse files Browse the repository at this point in the history
Version 2.4.4
  • Loading branch information
andyone authored Dec 12, 2024
2 parents 29d255f + 7127b81 commit 7ef9180
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 16 deletions.
10 changes: 5 additions & 5 deletions SOURCES/mass-builder
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
APP="MassBuilder"

# App version (String)
VER="6.1.3"
VER="6.1.4"

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

Expand Down Expand Up @@ -609,15 +609,15 @@ about() {
show ""
}

## 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 @@ -707,14 +707,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[@]}"

################################################################################
10 changes: 5 additions & 5 deletions SOURCES/rbbuild
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fi
APP="RBBuild"

# App version (String)
VER="2.4.3"
VER="2.4.4"

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

Expand Down Expand Up @@ -403,15 +403,15 @@ about() {
show ""
}

## 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 @@ -501,14 +501,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[@]}"

################################################################################
10 changes: 5 additions & 5 deletions SOURCES/rbdef
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ fi
APP="RBBuild Def Utils"

# App version (String)
VER="2.1.3"
VER="2.1.4"

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

Expand Down Expand Up @@ -916,15 +916,15 @@ if [[ -n "$PREFS_FILE" && -r "$PREFS_FILE" ]] ; then
unset arg argn argp
fi

## 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 @@ -1014,14 +1014,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 rbbuild.spec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

Summary: Utility for compiling and installing different ruby versions
Name: rbbuild
Version: 2.4.3
Version: 2.4.4
Release: 0%{?dist}
License: Apache License, Version 2.0
Vendor: ESSENTIAL KAOS
Expand Down Expand Up @@ -57,6 +57,9 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Fri Dec 06 2024 Anton Novojilov <andy@essentialkaos.com> - 2.4.4-0
- Improved options parsing

* Sat Aug 03 2024 Anton Novojilov <andy@essentialkaos.com> - 2.4.3-0
- Use all cores to build OpenSSL by default
- Removed 7zip support
Expand Down

0 comments on commit 7ef9180

Please sign in to comment.