Skip to content

Commit a172258

Browse files
mikeirvingwebgep13
authored andcommitted
(maint) Update brand names
Changes including spelling of MacOS -> macOS, OSX -> macOS, OS X -> macOS, .Net -> .NET, mono -> Mono in comments, docs and user information.
1 parent 94d373b commit a172258

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

GenerateDocs.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ The following are more advanced settings:
498498
* ChocolateyPackageParameters - Parameters to use with packaging, not the same as install arguments (which are passed directly to the native installer). Based on `--package-parameters`. (0.9.8.22+)
499499
* CHOCOLATEY_VERSION - The version of Choco you normally see. Use if you are 'lighting' things up based on choco version. (0.9.9+) - Otherwise take a dependency on the specific version you need.
500500
* ChocolateyForceX86 = If available and set to 'true', then user has requested 32bit version. (0.9.9+) - Automatically handled in built in Choco functions.
501-
* OS_PLATFORM - Like Windows, OSX, Linux. (0.9.9+)
501+
* OS_PLATFORM - Like Windows, macOS, Linux. (0.9.9+)
502502
* OS_VERSION - The version of OS, like 6.1 something something for Windows. (0.9.9+)
503503
* OS_NAME - The reported name of the OS. (0.9.9+)
504504
* IS_PROCESSELEVATED = Is the process elevated? (0.9.9+)

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ sudo apt-get install mono-devel -y
173173
* Consider adding the following to your `~/.profile` (or other relevant dot source file):
174174

175175
```sh
176-
# mono
176+
# Mono
177177
# http://www.michaelruck.de/2010/03/solving-pkg-config-and-mono-35-profile.html
178178
# https://cloudgen.wordpress.com/2013/03/06/configure-nant-to-run-under-mono-3-06-beta-for-mac-osx/
179179
export PKG_CONFIG_PATH=/opt/local/lib/pkgconfig:/Library/Frameworks/Mono.framework/Versions/Current/lib/pkgconfig:$PKG_CONFIG_PATH

build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -eo pipefail
33

44
##########################################################################
5-
# This is the Cake bootstrapper script for Linux and OS X.
5+
# This is the Cake bootstrapper script for Linux and macOS.
66
# This file was downloaded from https://github.com/cake-build/resources
77
# Feel free to change this file to fit your needs.
88
##########################################################################
@@ -23,7 +23,7 @@ export CAKE_PATHS_TOOLS=$TOOLS_DIR
2323
export CAKE_PATHS_ADDINS=$ADDINS_DIR
2424
export CAKE_PATHS_MODULES=$MODULES_DIR
2525

26-
# Define md5sum or md5 depending on Linux/OSX
26+
# Define md5sum or md5 depending on Linux / macOS
2727
MD5_EXE=
2828
if [[ "$(uname -s)" == "Darwin" ]]; then
2929
MD5_EXE="md5 -r"

docker/Dockerfile.windows

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ LABEL org.opencontainers.image.source="https://github.com/chocolatey/choco"
77
LABEL org.opencontainers.image.vendor="Chocolatey Software, Inc"
88
LABEL org.opencontainers.image.licenses="Apache-2.0"
99
LABEL org.opencontainers.image.title="Chocolatey"
10-
LABEL org.opencontainers.image.description="Chocolatey Client running on .Net"
10+
LABEL org.opencontainers.image.description="Chocolatey Client running on .NET"
1111
LABEL org.opencontainers.image.authors="https://chocolatey.org/support"
1212
LABEL org.opencontainers.image.base.name="mcr.microsoft.com/windows/servercore:${tagversion}"
1313

docker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Building Docker Image
22
=====================
33

4-
This directory contains the necessary files for building a Docker Images. There is a Windows based image which runs choco on .Net and a Linux based image that builds and runs choco with mono.
4+
This directory contains the necessary files for building a Docker Images. There is a Windows based image which runs choco on .NET and a Linux based image that builds and runs choco with Mono.
55

66
To build the Windows image yourself, follow these steps:
77

src/chocolatey/infrastructure.app/templates/ChocolateyReadMeTemplate.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ Chocolatey makes a number of environment variables available (You can access any
9393
* ChocolateyPackageParameters - Parameters to use with packaging, not the same as install arguments (which are passed directly to the native installer). Based on `--package-parameters`. (0.9.8.22+)
9494
* CHOCOLATEY_VERSION - The version of Choco you normally see. Use if you are 'lighting' things up based on choco version. (0.9.9+) - Otherwise take a dependency on the specific version you need.
9595
* ChocolateyForceX86 = If available and set to 'true', then user has requested 32bit version. (0.9.9+) - Automatically handled in built in Choco functions.
96-
* OS_PLATFORM - Like Windows, OSX, Linux. (0.9.9+)
96+
* OS_PLATFORM - Like Windows, macOS, Linux. (0.9.9+)
9797
* OS_VERSION - The version of OS, like 6.1 something something for Windows. (0.9.9+)
9898
* OS_NAME - The reported name of the OS. (0.9.9+)
9999
* USER_NAME = The user name (0.10.6+)

src/chocolatey/infrastructure/filesystem/DotNetFileSystem.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ public void move_directory(string directoryPath, string newDirectoryPath)
650650
{
651651
if (string.IsNullOrWhiteSpace(directoryPath) || string.IsNullOrWhiteSpace(newDirectoryPath)) throw new ApplicationException("You must provide a directory to move from or to.");
652652

653-
//Linux/MacOS do not have a SystemDrive environment variable, instead, everything is under "/"
653+
// Linux / macOS do not have a SystemDrive environment variable, instead, everything is under "/"
654654
var systemDrive = Platform.get_platform() == PlatformType.Windows ? Environment.GetEnvironmentVariable("SystemDrive") : "/";
655655
if (combine_paths(directoryPath, "").is_equal_to(combine_paths(systemDrive, ""))) throw new ApplicationException("Cannot move or delete the root of the system drive");
656656

@@ -745,7 +745,7 @@ public void delete_directory(string directoryPath, bool recursive, bool override
745745
{
746746
if (string.IsNullOrWhiteSpace(directoryPath)) throw new ApplicationException("You must provide a directory to delete.");
747747

748-
//Linux / MacOS do not have a SystemDrive environment variable, instead, everything is under "/"
748+
// Linux / macOS do not have a SystemDrive environment variable, instead, everything is under "/"
749749
var systemDrive = Platform.get_platform() == PlatformType.Windows ? Environment.GetEnvironmentVariable("SystemDrive") : "/";
750750
if (combine_paths(directoryPath, "").is_equal_to(combine_paths(systemDrive, ""))) throw new ApplicationException("Cannot move or delete the root of the system drive");
751751

src/chocolatey/infrastructure/platforms/Platform.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public static PlatformType get_platform()
5959
return PlatformType.Mac;
6060

6161
case PlatformID.Unix:
62-
// Well, there are chances MacOSX is reported as Unix instead of MacOSX.
62+
// Well, there are chances macOS is reported as Unix instead of macOS (MacOSX).
6363
// Instead of platform check, we'll do a feature checks (Mac specific root folders)
6464
if (file_system.directory_exists("/Applications")
6565
& file_system.directory_exists("/System")
@@ -85,7 +85,7 @@ public static string get_name()
8585
case PlatformType.Linux:
8686
return "Linux";
8787
case PlatformType.Mac:
88-
return "OS X";
88+
return "macOS";
8989
case PlatformType.Windows:
9090
return get_windows_name(get_version());
9191
default:

tests/packages/msi.template/templates/ReadMe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The following are more advanced settings:
7474
- Otherwise take a dependency on the specific version you need.
7575
* chocolateyForceX86 = If available and set to 'true', then user has requested 32bit version. (0.9.9+)
7676
- Automatically handled in built in Choco functions.
77-
* OS_PLATFORM = Like Windows, OSX, Linux. (0.9.9+)
77+
* OS_PLATFORM = Like Windows, macOS, Linux. (0.9.9+)
7878
* OS_VERSION = The version of OS, like 6.1 something something for Windows. (0.9.9+)
7979
* OS_NAME = The reported name of the OS. (0.9.9+)
8080
* IS_PROCESSELEVATED = Is the process elevated? (0.9.9+)

tests/packages/zip.template/templates/ReadMe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The following are more advanced settings:
7474
- Otherwise take a dependency on the specific version you need.
7575
* chocolateyForceX86 = If available and set to 'true', then user has requested 32bit version. (0.9.9+)
7676
- Automatically handled in built in Choco functions.
77-
* OS_PLATFORM = Like Windows, OSX, Linux. (0.9.9+)
77+
* OS_PLATFORM = Like Windows, macOS, Linux. (0.9.9+)
7878
* OS_VERSION = The version of OS, like 6.1 something something for Windows. (0.9.9+)
7979
* OS_NAME = The reported name of the OS. (0.9.9+)
8080
* IS_PROCESSELEVATED = Is the process elevated? (0.9.9+)

0 commit comments

Comments
 (0)