From: Sveinbjorn Thordarson Date: Thu, 25 Apr 2019 21:30:02 +0000 (+0000) Subject: Added detection of macOS 10.13/10.14, Mac OS X --> macOS. X-Git-Tag: AWSTATS_7_8~17^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c16041da6af6c8cdaaba945c57c83e98e9d914ab;p=thirdparty%2FAWStats.git 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 46cbfb95..e3fccff1 100644 --- a/docs/awstats_setup.html +++ b/docs/awstats_setup.html @@ -147,7 +147,7 @@ awstats_configure.pl will create a new file called awstats.awstats.model.conf. The new file location is:
- For Linux/BSD/Unix users: /etc/awstats.
-- 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).

diff --git a/docs/pad_awstats.xml b/docs/pad_awstats.xml index 34e4e330..2d150c28 100644 --- a/docs/pad_awstats.xml +++ b/docs/pad_awstats.xml @@ -44,7 +44,7 @@ Freeware Major Update No Install 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 + Linux,Linux GPL,Linux Open Source,macOS,Mac Other,OpenVMS,Unix,Win2000,Win7 x32,Win7 x64,WinServer,WinVista,WinVista x64,WinXP,Other 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 Development Tools diff --git a/make/pad/AWStats.pml b/make/pad/AWStats.pml index aad7cf99..8edb5f5b 100644 --- a/make/pad/AWStats.pml +++ b/make/pad/AWStats.pml @@ -14,7 +14,7 @@ Freeware Major Update No Install 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 + Linux,Linux GPL,Linux Open Source,macOS,Mac Other,OpenVMS,Unix,Win2000,Win7 x32,Win7 x64,WinServer,WinVista,WinVista x64,WinXP,Other 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 Development Tools diff --git a/tools/awstats_configure.pl b/tools/awstats_configure.pl index d02170c7..462528ee 100755 --- 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 249a1764..3e429edb 100644 --- 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','Microsoft XBOX', # Macintosh OS -'macosx12','Mac OS X 10.12 Sierra', -'macosx11','Mac OS X 10.11 El Capitan', -'macosx10','Mac OS X 10.10 Yosemite', -'macosx9','Mac OS X 10.9 Mavericks', -'macosx8','Mac OS X 10.8 Mountain Lion', -'macosx7','Mac OS X 10.7 Lion', -'macosx6','Mac OS X 10.6 Snow Leopard', -'macosx5','Mac OS X 10.5 Leopard', -'macosx4','Mac OS X 10.4 Tiger', -'macosx','Mac OS X others', +'macosx14','macOS 10.14 Mojave', +'macosx13','macOS 10.13 High Sierra', +'macosx12','macOS 10.12 Sierra', +'macosx11','OS X 10.11 El Capitan', +'macosx10','OS X 10.10 Yosemite', +'macosx9','OS X 10.9 Mavericks', +'macosx8','OS X 10.8 Mountain Lion', +'macosx7','Mac OS X 10.7 Lion', +'macosx6','Mac OS X 10.6 Snow Leopard', +'macosx5','Mac OS X 10.5 Leopard', +'macosx4','Mac OS X 10.4 Tiger', +'macosx','Mac OS X others', 'macintosh','Mac OS', # Linux 'linuxandroid','Google Android',