tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't exit early when setting up on Mac OS X. 

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.
This commit is contained in:
Darren Tucker 2023-10-30 13:26:52 +11:00
parent 1d6a878ceb
commit c5698abad6
No known key found for this signature in database
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
.github/setup_ci.sh vendored
View File

@ -18,8 +18,7 @@ case "$host" in
;; ;;
*-darwin*) *-darwin*)
PACKAGER=brew PACKAGER=brew
brew install automake PACKAGES="automake"
exit 0
;; ;;
*) *)
PACKAGER=apt PACKAGER=apt
@ -30,8 +29,6 @@ TARGETS=$@
INSTALL_FIDO_PPA="no" INSTALL_FIDO_PPA="no"
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
#echo "Setting up for '$TARGETS'"
set -ex set -ex
if [ -x "`which lsb_release 2>&1`" ]; then if [ -x "`which lsb_release 2>&1`" ]; then
@ -57,6 +54,7 @@ for flag in $CONFIGFLAGS; do
esac esac
done done
echo "Setting up for '$TARGETS'"
for TARGET in $TARGETS; do for TARGET in $TARGETS; do
case $TARGET in case $TARGET in
default|without-openssl|without-zlib|c89) default|without-openssl|without-zlib|c89)
@ -87,7 +85,9 @@ for TARGET in $TARGETS; do
esac esac
;; ;;
*pam) *pam)
PACKAGES="$PACKAGES libpam0g-dev" case "$PACKAGER" in
apt) PACKAGES="$PACKAGES libpam0g-dev" ;;
esac
;; ;;
sk) sk)
INSTALL_FIDO_PPA="yes" INSTALL_FIDO_PPA="yes"
@ -156,6 +156,13 @@ while [ ! -z "$PACKAGES" ] && [ "$tries" -gt "0" ]; do
PACKAGES="" PACKAGES=""
fi fi
;; ;;
brew)
if [ ! -z "PACKAGES" ]; then
if brew install $PACKAGES; then
PACKAGES=""
fi
fi
;;
setup) setup)
if /cygdrive/c/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then if /cygdrive/c/setup.exe -q -P `echo "$PACKAGES" | tr ' ' ,`; then
PACKAGES="" PACKAGES=""