Skip to content

Commit 6d31547

Browse files
fluffynutsfluffynuts
committed
📄 Update license to BSD-3-Clause
📄 Update nuspecs to reflect license as expression
1 parent 15324ed commit 6d31547

File tree

34 files changed

+48
-52
lines changed

34 files changed

+48
-52
lines changed

‎LICENSE

+6-19
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,10 @@
1-
Copyright (c) 2013, Davyd McColl
2-
All rights reserved.
1+
Copyright (c) 2013, Davyd McColl. All rights reserved.
32

4-
Redistribution and use in source and binary forms, with or without modification,
5-
are permitted provided that the following conditions are met:
3+
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
64

7-
* Redistributions of source code must retain the above copyright notice, this
8-
list of conditions and the following disclaimer.
5+
1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
6+
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
7+
3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
98

10-
* Redistributions in binary form must reproduce the above copyright notice, this
11-
list of conditions and the following disclaimer in the documentation and/or
12-
other materials provided with the distribution.
9+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1310

14-
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
15-
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
16-
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
17-
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
18-
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
19-
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
20-
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
21-
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
22-
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
23-
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

‎source/Async/PeanutButter.Async/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2424
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2525
<requireLicenseAcceptance>false</requireLicenseAcceptance>
26-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
26+
<license type="expression">BSD-3-Clause</license>
2727
<copyright>Copyright 2016</copyright>
2828
<dependencies>
2929
<group targetFramework="net40"></group>

‎source/Async/PeanutButter.TestUtils.Async/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2323
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2424
<requireLicenseAcceptance>false</requireLicenseAcceptance>
25-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
25+
<license type="expression">BSD-3-Clause</license>
2626
<copyright>Copyright 2016</copyright>
2727
<dependencies>
2828
<group targetFramework="net40">

‎source/DatabaseHelpers/PeanutButter.DatabaseHelpers.Testability/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2323
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2424
<requireLicenseAcceptance>false</requireLicenseAcceptance>
25-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
25+
<license type="expression">BSD-3-Clause</license>
2626
<copyright>Copyright 2014</copyright>
2727
<dependencies>
2828
<group targetFramework="net40">

‎source/DatabaseHelpers/PeanutButter.DatabaseHelpers/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2121
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2222
<requireLicenseAcceptance>false</requireLicenseAcceptance>
23-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
23+
<license type="expression">BSD-3-Clause</license>
2424
<copyright>Copyright 2014</copyright>
2525
<dependencies>
2626
<group targetFramework="net45">

‎source/EmailSpooler/EmailSpooler.Win32Service.DB/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2424
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2525
<requireLicenseAcceptance>false</requireLicenseAcceptance>
26-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
26+
<license type="expression">BSD-3-Clause</license>
2727
<copyright>Copyright 2015</copyright>
2828
<dependencies>
2929
<group targetFramework="net40">

‎source/EmailSpooler/EmailSpooler.Win32Service.Entity/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1818
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
1919
<requireLicenseAcceptance>false</requireLicenseAcceptance>
20-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
20+
<license type="expression">BSD-3-Clause</license>
2121
<copyright>Copyright 2015</copyright>
2222
<dependencies>
2323
<group targetFramework="net40">

‎source/INI/PeanutButter.INI/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1919
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2020
<requireLicenseAcceptance>false</requireLicenseAcceptance>
21-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
21+
<license type="expression">BSD-3-Clause</license>
2222
<copyright>Copyright 2014</copyright>
2323
<dependencies>
2424
<group targetFramework="net40"></group>

‎source/NugetPackageVersionIncrementer.Tests/Resources/package1.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<projectUrl>https://davydm.blogspot.com/search/label/PeanutButter</projectUrl>
2424
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2525
<requireLicenseAcceptance>false</requireLicenseAcceptance>
26-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
26+
<license type="expression">BSD-3-Clause</license>
2727
<copyright>Copyright 2015</copyright>
2828
<dependencies>
2929
<group targetFramework="net40">

‎source/NugetPackageVersionIncrementer.Tests/Resources/package2.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<projectUrl>https://davydm.blogspot.com/search/label/PeanutButter</projectUrl>
2020
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2121
<requireLicenseAcceptance>false</requireLicenseAcceptance>
22-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
22+
<license type="expression">BSD-3-Clause</license>
2323
<copyright>Copyright 2014</copyright>
2424
<dependencies>
2525
<group targetFramework="net40">

‎source/SimpleServers/PeanutButter.SimpleHTTPServer.Testability/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2121
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2222
<requireLicenseAcceptance>false</requireLicenseAcceptance>
23-
<licenseUrl>http://www.codeproject.com/info/cpol10.aspx</licenseUrl>
23+
<license type="expression">BSD-3-Clause</license>
2424
<copyright>Copyright 2016</copyright>
2525
<dependencies>
2626
<group targetFramework="net40">

‎source/SimpleServers/PeanutButter.SimpleHTTPServer/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2424
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2525
<requireLicenseAcceptance>false</requireLicenseAcceptance>
26-
<licenseUrl>http://www.codeproject.com/info/cpol10.aspx</licenseUrl>
26+
<license type="expression">BSD-3-Clause</license>
2727
<copyright>Copyright 2014</copyright>
2828
<dependencies>
2929
<group targetFramework="net40">

‎source/SimpleServers/PeanutButter.SimpleTcpServer/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2727
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2828
<requireLicenseAcceptance>false</requireLicenseAcceptance>
29-
<licenseUrl>http://www.codeproject.com/info/cpol10.aspx</licenseUrl>
29+
<license type="expression">BSD-3-Clause</license>
3030
<copyright>Copyright 2014</copyright>
3131
<dependencies>
3232
<group targetFramework="net40"></group>

‎source/TempDb/PeanutButter.TempDb.LocalDb/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1818
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
1919
<requireLicenseAcceptance>false</requireLicenseAcceptance>
20-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
20+
<license type="expression">BSD-3-Clause</license>
2121
<copyright>Copyright 2015</copyright>
2222
<dependencies>
2323
<group targetFramework="net40">

‎source/TempDb/PeanutButter.TempDb.MySql/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1818
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
1919
<requireLicenseAcceptance>false</requireLicenseAcceptance>
20-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
20+
<license type="expression">BSD-3-Clause</license>
2121
<copyright>Copyright 2015</copyright>
2222
<dependencies>
2323
<group targetFramework="net40">

‎source/TempDb/PeanutButter.TempDb.SqlCe/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1818
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
1919
<requireLicenseAcceptance>false</requireLicenseAcceptance>
20-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
20+
<license type="expression">BSD-3-Clause</license>
2121
<copyright>Copyright 2015</copyright>
2222
<dependencies>
2323
<group targetFramework="net40">

‎source/TempDb/PeanutButter.TempDb.Sqlite/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1818
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
1919
<requireLicenseAcceptance>false</requireLicenseAcceptance>
20-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
20+
<license type="expression">BSD-3-Clause</license>
2121
<copyright>Copyright 2015</copyright>
2222
<dependencies>
2323
<group targetFramework="net40">

‎source/TempDb/PeanutButter.TempDb/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2222
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2323
<requireLicenseAcceptance>false</requireLicenseAcceptance>
24-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
24+
<license type="expression">BSD-3-Clause</license>
2525
<copyright>Copyright 2015</copyright>
2626
<dependencies>
2727
<group targetFramework="net40">

‎source/TestUtils/PeanutButter.RandomGenerators/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1919
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2020
<requireLicenseAcceptance>false</requireLicenseAcceptance>
21-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
21+
<license type="expression">BSD-3-Clause</license>
2222
<copyright>Copyright 2014</copyright>
2323
<dependencies>
2424
<group targetFramework="net40">

‎source/TestUtils/PeanutButter.TestUtils.Entity/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2525
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2626
<requireLicenseAcceptance>false</requireLicenseAcceptance>
27-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
27+
<license type="expression">BSD-3-Clause</license>
2828
<copyright>Copyright 2015</copyright>
2929
<dependencies>
3030
<group targetFramework="net40">

‎source/TestUtils/PeanutButter.TestUtils.Generic/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
3131
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
3232
<requireLicenseAcceptance>false</requireLicenseAcceptance>
33-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
33+
<license type="expression">BSD-3-Clause</license>
3434
<copyright>Copyright 2014</copyright>
3535
<dependencies>
3636
<group targetFramework="net40">

‎source/TestUtils/PeanutButter.TestUtils.MVC/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2222
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2323
<requireLicenseAcceptance>false</requireLicenseAcceptance>
24-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
24+
<license type="expression">BSD-3-Clause</license>
2525
<copyright>Copyright 2016</copyright>
2626
<dependencies>
2727
<group targetFramework="net40">

‎source/TinyEventAggregator/PeanutButter.TinyEventAggregator/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2222
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2323
<requireLicenseAcceptance>false</requireLicenseAcceptance>
24-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
24+
<license type="expression">BSD-3-Clause</license>
2525
<copyright>Copyright 2014</copyright>
2626
<dependencies>
2727
<group targetFramework="net40"></group>

‎source/TrayIcon/PeanutButter.TrayIcon/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1818
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
1919
<requireLicenseAcceptance>false</requireLicenseAcceptance>
20-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
20+
<license type="expression">BSD-3-Clause</license>
2121
<copyright>Copyright 2014</copyright>
2222
<dependencies>
2323
<group targetFramework="net40"></group>

‎source/Utils/PeanutButter.DuckTyping/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2323
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2424
<requireLicenseAcceptance>false</requireLicenseAcceptance>
25-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
25+
<license type="expression">BSD-3-Clause</license>
2626
<copyright>Copyright 2016</copyright>
2727
<dependencies>
2828
<group targetFramework="net45"></group>

‎source/Utils/PeanutButter.FluentMigrator/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1919
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2020
<requireLicenseAcceptance>false</requireLicenseAcceptance>
21-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
21+
<license type="expression">BSD-3-Clause</license>
2222
<copyright>Copyright 2014</copyright>
2323
<dependencies>
2424
<group targetFramework="net40">

‎source/Utils/PeanutButter.JObjectExtensions/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2424
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2525
<requireLicenseAcceptance>false</requireLicenseAcceptance>
26-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
26+
<license type="expression">BSD-3-Clause</license>
2727
<copyright>Copyright 2017</copyright>
2828
<dependencies>
2929
<group targetFramework="net45">

‎source/Utils/PeanutButter.Utils.Entity/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
3939
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
4040
<requireLicenseAcceptance>false</requireLicenseAcceptance>
41-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
41+
<license type="expression">BSD-3-Clause</license>
4242
<copyright>Copyright 2015</copyright>
4343
<dependencies>
4444
<group targetFramework="net40">

‎source/Utils/PeanutButter.Utils.Windsor/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<projectUrl>https://davydm.blogspot.com/search/label/PeanutButter</projectUrl>
2020
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2121
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
22-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
22+
<license type="expression">BSD-3-Clause</license>
2323
<requireLicenseAcceptance>false</requireLicenseAcceptance>
2424
<copyright>Copyright 2016</copyright>
2525
<dependencies>

‎source/Utils/PeanutButter.Utils/Find.cs

+10-1
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,19 @@ public static string InPath(string search)
2525
var extensions = IsUnixy ? new string[0] : GenerateWindowsExecutableExtensionsList();
2626
return paths.Aggregate(
2727
null as string,
28-
(acc, cur) => acc ?? SearchFor(search, cur, extensions)
28+
(acc, cur) => acc ?? ValidateExecutable(SearchFor(search, cur, extensions))
2929
);
3030
}
3131

32+
private static string ValidateExecutable(string filePath)
33+
{
34+
if (filePath == null || !IsUnixy)
35+
{
36+
return filePath;
37+
}
38+
return null;
39+
}
40+
3241
private static string[] GenerateWindowsExecutableExtensionsList()
3342
{
3443
return (Environment.GetEnvironmentVariable("PATHEXT") ?? "")

‎source/Utils/PeanutButter.Utils/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1616
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
1717
<requireLicenseAcceptance>false</requireLicenseAcceptance>
18-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
18+
<license type="expression">BSD-3-Clause</license>
1919
<copyright>Copyright 2014</copyright>
2020
<dependencies>
2121
<group targetFramework="net40"></group>

‎source/Utils/PeanutButter.XmlUtils/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1616
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
1717
<requireLicenseAcceptance>false</requireLicenseAcceptance>
18-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
18+
<license type="expression">BSD-3-Clause</license>
1919
<copyright>Copyright 2014</copyright>
2020
<dependencies>
2121
<group targetFramework="net40"></group>

‎source/Win32Service/PeanutButter.ServiceShell/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
1919
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2020
<requireLicenseAcceptance>false</requireLicenseAcceptance>
21-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
21+
<license type="expression">BSD-3-Clause</license>
2222
<copyright>Copyright 2014</copyright>
2323
<dependencies>
2424
<group targetFramework="net40">

‎source/Win32Service/PeanutButter.WindowsServiceManagement/Package.nuspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<repository type="git" url="https://github.com/fluffynuts/PeanutButter" />
2424
<iconUrl>https://nuget.org/Content/Images/packageDefaultIcon-50x50.png</iconUrl>
2525
<requireLicenseAcceptance>false</requireLicenseAcceptance>
26-
<licenseUrl>https://github.com/fluffynuts/PeanutButter/blob/master/LICENSE</licenseUrl>
26+
<license type="expression">BSD-3-Clause</license>
2727
<copyright>Copyright 2014</copyright>
2828
<dependencies>
2929
<group targetFramework="net40"></group>

0 commit comments

Comments
 (0)