Skip to content

Commit

Permalink
Don't exit early when setting up on Mac OS X.
Browse files Browse the repository at this point in the history
We probably need some of the other bits in there (specifically, setting
the perms on the home directory) so make it less of a special snowflake.
  • Loading branch information
daztucker committed Oct 30, 2023
1 parent 1d6a878 commit c5698ab
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions .github/setup_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ case "$host" in
;;
*-darwin*)
PACKAGER=brew
brew install automake
exit 0
PACKAGES="automake"
;;
*)
PACKAGER=apt
Expand All @@ -30,8 +29,6 @@ TARGETS=$@
INSTALL_FIDO_PPA="no"
export DEBIAN_FRONTEND=noninteractive

#echo "Setting up for '$TARGETS'"

set -ex

if [ -x "`which lsb_release 2>&1`" ]; then
Expand All @@ -57,6 +54,7 @@ for flag in $CONFIGFLAGS; do
esac
done

echo "Setting up for '$TARGETS'"
for TARGET in $TARGETS; do
case $TARGET in
default|without-openssl|without-zlib|c89)
Expand Down Expand Up @@ -87,7 +85,9 @@ for TARGET in $TARGETS; do
esac
;;
*pam)
PACKAGES="$PACKAGES libpam0g-dev"
case "$PACKAGER" in
apt) PACKAGES="$PACKAGES libpam0g-dev" ;;
esac
;;
sk)
INSTALL_FIDO_PPA="yes"
Expand Down Expand Up @@ -156,6 +156,13 @@ while [ ! -z "$PACKAGES" ] && [ "$tries" -gt "0" ]; do
PACKAGES=""
fi
;;
brew)
if [ ! -z "PACKAGES" ]; then
if brew install $PACKAGES; then
PACKAGES=""
fi
fi
;;
setup)
if /cygdrive/c/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then
PACKAGES=""
Expand Down

0 comments on commit c5698ab

Please sign in to comment.