Added detection of macOS 10.13/10.14, Mac OS X --> macOS.

diff --git a/docs/awstats_setup.html b/docs/awstats_setup.html
index 46cbfb958ceb3f525e0259bdee6d4cf35903316f..e3fccff1cb4ad6beb2509199b9b049cb94169952 100644 (file)
--- a/docs/awstats_setup.html
+++ b/docs/awstats_setup.html
@@ -147,7 +147,7 @@ awstats_configure.pl will create a new file called <b>awstats.<span
 by copying the template file <b>awstats.model.conf</b>.
 The new file location is:<br>
 - For Linux/BSD/Unix users: /etc/awstats.<br>
-- For Mac OS X, Windows and other operating systems: the same directory
+- For macOS, Windows and other operating systems: the same directory
 as awstats.pl
 (cgi-bin).<br>
 <br>

diff --git a/docs/pad_awstats.xml b/docs/pad_awstats.xml
index 34e4e3308e2ed6084b3b6e16e03716d80a89cd87..2d150c281a51164d38a5b5569c349bf9abb95a2b 100644 (file)
--- a/docs/pad_awstats.xml
+++ b/docs/pad_awstats.xml
@@ -44,7 +44,7 @@
                <Program_Type>Freeware</Program_Type>\r
                <Program_Release_Status>Major Update</Program_Release_Status>\r
                <Program_Install_Support>No Install Support</Program_Install_Support>\r
-               <Program_OS_Support>Linux,Linux GPL,Linux Open Source,Mac OS X,Mac Other,OpenVMS,Unix,Win2000,Win7 x32,Win7 x64,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>\r
+               <Program_OS_Support>Linux,Linux GPL,Linux Open Source,macOS,Mac Other,OpenVMS,Unix,Win2000,Win7 x32,Win7 x64,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>\r
                <Program_Language>English,Arabic,Armenian,Breton,Bulgarian,Catalan,Chinese,ChineseSimplified,ChineseTraditional,Croatian,Czech,Danish,Dutch,Estonian,Finnish,French,Galician,German,Greek,Hebrew,Hungarian,Icelandic,Indonesian,Italian,Japanese,Korean,Latvian,Norwegian,Other,Polish,Portuguese,Romanian,Russian,Serbian,Slovak,Slovenian,Spanish,Swedish,Thai,Turkish,Ukrainian,Welsh</Program_Language>\r
                <Program_Change_Info />\r
                <Program_Specific_Category>Development Tools</Program_Specific_Category>\r

diff --git a/make/pad/AWStats.pml b/make/pad/AWStats.pml
index aad7cf996014e10157e882170edee754801f7148..8edb5f5bacbd5bd8faf907c0b51b2929b47def25 100644 (file)
--- a/make/pad/AWStats.pml
+++ b/make/pad/AWStats.pml
@@ -14,7 +14,7 @@
                <Program_Type>Freeware</Program_Type>\r
                <Program_Release_Status>Major Update</Program_Release_Status>\r
                <Program_Install_Support>No Install Support</Program_Install_Support>\r
-               <Program_OS_Support>Linux,Linux GPL,Linux Open Source,Mac OS X,Mac Other,OpenVMS,Unix,Win2000,Win7 x32,Win7 x64,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>\r
+               <Program_OS_Support>Linux,Linux GPL,Linux Open Source,macOS,Mac Other,OpenVMS,Unix,Win2000,Win7 x32,Win7 x64,WinServer,WinVista,WinVista x64,WinXP,Other</Program_OS_Support>\r
                <Program_Language>English,Arabic,Armenian,Breton,Bulgarian,Catalan,Chinese,ChineseSimplified,ChineseTraditional,Croatian,Czech,Danish,Dutch,Estonian,Finnish,French,Galician,German,Greek,Hebrew,Hungarian,Icelandic,Indonesian,Italian,Japanese,Korean,Latvian,Norwegian,Other,Polish,Portuguese,Romanian,Russian,Serbian,Slovak,Slovenian,Spanish,Swedish,Thai,Turkish,Ukrainian,Welsh</Program_Language>\r
                <Program_Change_Info />\r
                <Program_Specific_Category>Development Tools</Program_Specific_Category>\r

diff --git a/tools/awstats_configure.pl b/tools/awstats_configure.pl
index d02170c758a84a5811c7e504974be6900b845752..462528ee24637fb70ff1c4f28c0f8fc5c7c91ebc 100755 (executable)
--- a/tools/awstats_configure.pl
+++ b/tools/awstats_configure.pl
@@ -74,7 +74,7 @@ $WebServerChanged=0;
 $UseAlias=0;
 %LogFormat=();
 %ConfToChange=();
-%OSLib=('linux'=>'Linux, BSD or Unix','macosx'=>'Mac OS','windows'=>'Windows');
+%OSLib=('linux'=>'Linux, BSD or Unix','macosx'=>'macOS','windows'=>'Windows');
 $Step=0;
 
 
@@ -334,7 +334,7 @@ elsif ($OS eq 'macosx') {
        $AWSTATS_PATH=~s/tools[\\\/]?$//;
        $AWSTATS_PATH=~s/[\\\/]$//;
        if ($AWSTATS_PATH ne '/Library/WebServer/awstats') {
-               print "Warning: AWStats standard directory on Mac OS X is '/Library/WebServer/awstats'.\n";
+               print "Warning: AWStats standard directory on macOS is '/Library/WebServer/awstats'.\n";
                print "If you want to use standard directory, you should first move all content\n";
                print "of AWStats distribution from current directory:\n";
                print "$AWSTATS_PATH\n";

diff --git a/wwwroot/cgi-bin/lib/operating_systems.pm b/wwwroot/cgi-bin/lib/operating_systems.pm
index 249a17643e12cdf1ed3b3f74bc2039810d63d2b1..3e429edb801576fad5ce1d7cf38b31d2e1982a93 100644 (file)
--- a/wwwroot/cgi-bin/lib/operating_systems.pm
+++ b/wwwroot/cgi-bin/lib/operating_systems.pm
@@ -177,6 +177,8 @@
 'ipad','ios_ipad', #Must be Before Mac OS Family
 'ipod','ios_ipod',  #Must be Before Mac OS Family
 # Macintosh OS family
+'mac[_+ ]os[_+ ]x[_+ ]10[_\.]14','macosx14',
+'mac[_+ ]os[_+ ]x[_+ ]10[_\.]13','macosx13',
 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]12','macosx12',
 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]11','macosx11',
 'mac[_+ ]os[_+ ]x[_+ ]10[_\.]10','macosx10',
@@ -281,16 +283,18 @@
 'winunknown','Windows (unknown version)',
 'winxbox','<a href="http://www.xbox.com/" title="Microsoft XBOX home page [new window]" target="_blank" rel="noopener noreferrer">Microsoft XBOX</a>',
 # Macintosh OS
-'macosx12','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.12 Sierra</a>',
-'macosx11','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.11 El Capitan</a>',
-'macosx10','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.10 Yosemite</a>',
-'macosx9','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.9 Mavericks</a>',
-'macosx8','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.8 Mountain Lion</a>',
-'macosx7','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.7 Lion</a>',
-'macosx6','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.6 Snow Leopard</a>',
-'macosx5','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.5 Leopard</a>',
-'macosx4','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.4 Tiger</a>',
-'macosx','<a href="http://www.apple.com/macosx/" title="Mac OS X home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X others</a>',
+'macosx14','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">macOS 10.14 Mojave</a>',
+'macosx13','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">macOS 10.13 High Sierra</a>',
+'macosx12','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">macOS 10.12 Sierra</a>',
+'macosx11','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">OS X 10.11 El Capitan</a>',
+'macosx10','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">OS X 10.10 Yosemite</a>',
+'macosx9','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">OS X 10.9 Mavericks</a>',
+'macosx8','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">OS X 10.8 Mountain Lion</a>',
+'macosx7','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.7 Lion</a>',
+'macosx6','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.6 Snow Leopard</a>',
+'macosx5','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.5 Leopard</a>',
+'macosx4','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X 10.4 Tiger</a>',
+'macosx','<a href="http://www.apple.com/macos/" title="macOS home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS X others</a>',
 'macintosh','<a href="http://www.apple.com/" title="Mac OS home page [new window]" target="_blank" rel="noopener noreferrer">Mac OS</a>',
 # Linux
 'linuxandroid','<a href="http://code.google.com/android/" title="Google Android home page [new window]" target="_blank" rel="noopener noreferrer">Google Android</a>',