starred/certbot-certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-08-01 02:44:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Rename OS X -> macOS (#3965)

Browse Source 
* Rename OS X -> macOS

* Revert *-auto
This commit is contained in:
Lipis
2017-01-10 12:24:15 -08:00
committed by Peter Eckersley
parent a146102c73
commit bba5d7d950
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/contributing.rst
+1 -1
View File
@@ -107,7 +107,7 @@ command you are required to run is::
Otherwise, please follow the following instructions. Otherwise, please follow the following instructions.
Mac OS X users: Run ``./tests/mac-bootstrap.sh`` instead of macOS users: Run ``./tests/mac-bootstrap.sh`` instead of
``boulder-start.sh`` to install dependencies, configure the ``boulder-start.sh`` to install dependencies, configure the
environment, and start boulder. environment, and start boulder.
letsencrypt-auto-source/letsencrypt-auto
+4 -4
View File
@@ -497,7 +497,7 @@ BootstrapMac() {
$pkgcmd python $pkgcmd python
fi fi
# Workaround for _dlopen not finding augeas on OS X # Workaround for _dlopen not finding augeas on macOS
if [ "$pkgman" = "port" ] && ! [ -e "/usr/local/lib/libaugeas.dylib" ] && [ -e "/opt/local/lib/libaugeas.dylib" ]; then if [ "$pkgman" = "port" ] && ! [ -e "/usr/local/lib/libaugeas.dylib" ] && [ -e "/opt/local/lib/libaugeas.dylib" ]; then
echo "Applying augeas workaround" echo "Applying augeas workaround"
$SUDO mkdir -p /usr/local/lib/ $SUDO mkdir -p /usr/local/lib/
@@ -580,7 +580,7 @@ Bootstrap() {
elif uname | grep -iq FreeBSD ; then elif uname | grep -iq FreeBSD ; then
ExperimentalBootstrap "FreeBSD" BootstrapFreeBsd ExperimentalBootstrap "FreeBSD" BootstrapFreeBsd
elif uname | grep -iq Darwin ; then elif uname | grep -iq Darwin ; then
ExperimentalBootstrap "Mac OS X" BootstrapMac ExperimentalBootstrap "macOS" BootstrapMac
elif [ -f /etc/issue ] && grep -iq "Amazon Linux" /etc/issue ; then elif [ -f /etc/issue ] && grep -iq "Amazon Linux" /etc/issue ; then
ExperimentalBootstrap "Amazon Linux" BootstrapRpmCommon ExperimentalBootstrap "Amazon Linux" BootstrapRpmCommon
elif [ -f /etc/product ] && grep -q "Joyent Instance" /etc/product ; then elif [ -f /etc/product ] && grep -q "Joyent Instance" /etc/product ; then
@@ -596,7 +596,7 @@ Bootstrap() {
} }
TempDir() { TempDir() {
mktemp -d 2>/dev/null || mktemp -d -t 'le' # Linux || OS X mktemp -d 2>/dev/null || mktemp -d -t 'le' # Linux || macOS
} }
@@ -1193,7 +1193,7 @@ UNLIKELY_EOF
# TODO: Deal with quotes in pathnames. # TODO: Deal with quotes in pathnames.
echo "Replacing certbot-auto..." echo "Replacing certbot-auto..."
# Clone permissions with cp. chmod and chown don't have a --reference # Clone permissions with cp. chmod and chown don't have a --reference
# option on OS X or BSD, and stat -c on Linux is stat -f on OS X and BSD: # option on macOS or BSD, and stat -c on Linux is stat -f on macOS and BSD:
$SUDO cp -p "$0" "$TEMP_DIR/letsencrypt-auto.permission-clone" $SUDO cp -p "$0" "$TEMP_DIR/letsencrypt-auto.permission-clone"
$SUDO cp "$TEMP_DIR/letsencrypt-auto" "$TEMP_DIR/letsencrypt-auto.permission-clone" $SUDO cp "$TEMP_DIR/letsencrypt-auto" "$TEMP_DIR/letsencrypt-auto.permission-clone"
# Using mv rather than cp leaves the old file descriptor pointing to the # Using mv rather than cp leaves the old file descriptor pointing to the
letsencrypt-auto-source/letsencrypt-auto.template
+3 -3
View File
@@ -231,7 +231,7 @@ Bootstrap() {
elif uname | grep -iq FreeBSD ; then elif uname | grep -iq FreeBSD ; then
ExperimentalBootstrap "FreeBSD" BootstrapFreeBsd ExperimentalBootstrap "FreeBSD" BootstrapFreeBsd
elif uname | grep -iq Darwin ; then elif uname | grep -iq Darwin ; then
ExperimentalBootstrap "Mac OS X" BootstrapMac ExperimentalBootstrap "macOS" BootstrapMac
elif [ -f /etc/issue ] && grep -iq "Amazon Linux" /etc/issue ; then elif [ -f /etc/issue ] && grep -iq "Amazon Linux" /etc/issue ; then
ExperimentalBootstrap "Amazon Linux" BootstrapRpmCommon ExperimentalBootstrap "Amazon Linux" BootstrapRpmCommon
elif [ -f /etc/product ] && grep -q "Joyent Instance" /etc/product ; then elif [ -f /etc/product ] && grep -q "Joyent Instance" /etc/product ; then
@@ -247,7 +247,7 @@ Bootstrap() {
} }
TempDir() { TempDir() {
mktemp -d 2>/dev/null || mktemp -d -t 'le' # Linux || OS X mktemp -d 2>/dev/null || mktemp -d -t 'le' # Linux || macOS
} }
@@ -387,7 +387,7 @@ UNLIKELY_EOF
# TODO: Deal with quotes in pathnames. # TODO: Deal with quotes in pathnames.
echo "Replacing certbot-auto..." echo "Replacing certbot-auto..."
# Clone permissions with cp. chmod and chown don't have a --reference # Clone permissions with cp. chmod and chown don't have a --reference
# option on OS X or BSD, and stat -c on Linux is stat -f on OS X and BSD: # option on macOS or BSD, and stat -c on Linux is stat -f on macOS and BSD:
$SUDO cp -p "$0" "$TEMP_DIR/letsencrypt-auto.permission-clone" $SUDO cp -p "$0" "$TEMP_DIR/letsencrypt-auto.permission-clone"
$SUDO cp "$TEMP_DIR/letsencrypt-auto" "$TEMP_DIR/letsencrypt-auto.permission-clone" $SUDO cp "$TEMP_DIR/letsencrypt-auto" "$TEMP_DIR/letsencrypt-auto.permission-clone"
# Using mv rather than cp leaves the old file descriptor pointing to the # Using mv rather than cp leaves the old file descriptor pointing to the
letsencrypt-auto-source/pieces/bootstrappers/mac.sh
+1 -1
View File
@@ -23,7 +23,7 @@ BootstrapMac() {
$pkgcmd python $pkgcmd python
fi fi
# Workaround for _dlopen not finding augeas on OS X # Workaround for _dlopen not finding augeas on macOS
if [ "$pkgman" = "port" ] && ! [ -e "/usr/local/lib/libaugeas.dylib" ] && [ -e "/opt/local/lib/libaugeas.dylib" ]; then if [ "$pkgman" = "port" ] && ! [ -e "/usr/local/lib/libaugeas.dylib" ] && [ -e "/opt/local/lib/libaugeas.dylib" ]; then
echo "Applying augeas workaround" echo "Applying augeas workaround"
$SUDO mkdir -p /usr/local/lib/ $SUDO mkdir -p /usr/local/lib/
tests/integration/_common.sh
+1 -1
View File
@@ -2,7 +2,7 @@
if [ "xxx$root" = "xxx" ]; if [ "xxx$root" = "xxx" ];
then then
# The -t is required on OS X. It provides a template file path for # The -t is required on macOS. It provides a template file path for
# the kernel to use. # the kernel to use.
root="$(mktemp -d -t leitXXXX)" root="$(mktemp -d -t leitXXXX)"
echo "Root integration tests directory: $root" echo "Root integration tests directory: $root"