Skip to content

Commit

Permalink
v2.4.3: fix #117
Browse files Browse the repository at this point in the history
  • Loading branch information
icy committed Feb 15, 2020
1 parent 1448379 commit ecf2a41
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
## v2.4.3

* `lib/homebrew`: Support `cask` (fix #117)
* `tests/dpkg`: Support new distros, drop support for old distro

## v2.4.2

* Update README.md
Expand Down
20 changes: 14 additions & 6 deletions pacapt
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
# Purpose: A wrapper for all Unix package managers
# License: Fair license (http://www.opensource.org/licenses/fair)
# Source : http://github.com/icy/pacapt/
# Version: 2.4.2
# Version: 2.4.3
# Authors: Anh K. Huynh et al.

# Copyright (C) 2010 - 2019 \
# Copyright (C) 2010 - 2020 \
# | 10sr (10sr)
# | Alexander Dupuy (dupuy)
# | Anh K. Huynh (icy)
Expand Down Expand Up @@ -44,9 +44,9 @@

_print_pacapt_version() {
cat <<_EOF_
pacapt version '2.4.2'
pacapt version '2.4.3'
Copyright (C) 2010 - 2019 \\
Copyright (C) 2010 - 2020 \\
| 10sr (10sr)
| Alexander Dupuy (dupuy)
| Anh K. Huynh (icy)
Expand Down Expand Up @@ -83,7 +83,7 @@ DISCLAIMER: THE WORKS ARE WITHOUT WARRANTY.
_EOF_
}

export PACAPT_VERSION='2.4.2'
export PACAPT_VERSION='2.4.3'

_help() {
cat <<'EOF'
Expand Down Expand Up @@ -1117,7 +1117,15 @@ homebrew_Sccc() {
}

homebrew_S() {
brew install $_TOPT "$@"
2>&1 brew install $_TOPT "$@" \
| awk '{print; if ($0 ~ /brew cask install/) { exit(126); }}'
ret=( ${PIPESTATUS[*]} )
if [[ "${ret[1]}" == 126 ]]; then
echo >&2 ":: Now trying with brew/cask..."
brew cask install $_TOPT "$@"
else
return "${ret[0]}"
fi
}


Expand Down

0 comments on commit ecf2a41

Please sign in to comment.