Misc: Fix failing build

This commit is contained in:
Dylan Araps 2016-11-06 21:37:13 +11:00
parent 730a8b0290
commit d91361138a
1 changed files with 5 additions and 5 deletions

View File

@ -202,14 +202,14 @@ getdistro() {
distro="$codename $osx_version $osx_build" distro="$codename $osx_version $osx_build"
case "$distro_shorthand" in case "$distro_shorthand" in
"on") distro="${distro/ "${osx_build}"}" ;; "on") distro="${distro/ ${osx_build}}" ;;
"tiny") "tiny")
case "$osx_version" in case "$osx_version" in
"10."[4-7]*) distro="${distro/${codename}/Mac OS X}" ;; "10."[4-7]*) distro="${distro/${codename}/Mac OS X}" ;;
"10."[8-9]* | "10.1"[0-1]*) distro="${distro/${codename}/OS X}" ;; "10."[8-9]* | "10.1"[0-1]*) distro="${distro/${codename}/OS X}" ;;
"10.12"*) distro="${distro/${codename}/macOS}" ;; "10.12"*) distro="${distro/${codename}/macOS}" ;;
esac esac
distro="${distro/ "${osx_build}"}" distro="${distro/ ${osx_build}}"
;; ;;
esac esac
;; ;;
@ -435,13 +435,13 @@ getpackages() {
packages="$(($(ls -l /usr/local/bin/ | grep -v "\(../Cellar/\|brew\)" | wc -l) - 1))" packages="$(($(ls -l /usr/local/bin/ | grep -v "\(../Cellar/\|brew\)" | wc -l) - 1))"
type -p port >/dev/null && \ type -p port >/dev/null && \
packages="$((packages + "$(port installed | wc -l)" - 1))" packages="$((packages + $(port installed | wc -l) - 1))"
type -p brew >/dev/null && \ type -p brew >/dev/null && \
packages="$((packages + "$(find /usr/local/Cellar -maxdepth 1 | wc -l)" - 1))" packages="$((packages + $(find /usr/local/Cellar -maxdepth 1 | wc -l) - 1))"
type -p pkgin >/dev/null && \ type -p pkgin >/dev/null && \
packages="$((packages + "$(pkgin list | wc -l)"))" packages="$((packages + $(pkgin list | wc -l)))"
;; ;;
"BSD") "BSD")