Skip to content

Commit

Permalink
Merge branch 'public/9.0' into public/9.1
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelherger committed Dec 14, 2024
2 parents 6ef5795 + e885843 commit 39d8337
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
10 changes: 5 additions & 5 deletions Bin/darwin/check-update.pl
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
use FindBin qw($Bin);

BEGIN {
my $libPath = "$Bin/../..";

# This works like 'use lib'
# prepend our directories to @INC so we look there first.
unshift @INC, $libPath, "$libPath/CPAN";
foreach my $libPath ("$Bin/../Resources/server", "$Bin/../..") {
# This works like 'use lib'
# prepend our directories to @INC so we look there first.
unshift @INC, $libPath, "$libPath/CPAN";
}
}

use constant RESIZER => 0;
Expand Down
2 changes: 1 addition & 1 deletion Changelog9.html
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ <h2><a name="v9.0.1" id="v9.0.1"></a>Version 9.0.1</h2>
<li>Fix helper search path initialisation on older macOS using Perl 5.18.</li>
<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/74">#74</a> - Speed up Perl installation during an initial installation on Windows.</li>
<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/75">#75</a> - Make sure newly installed LMS on Windows is running before sending the user to the web page.</li>
<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/77">#77</a> - Add instructions to the macOS DMG file.</li>
<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/77">#77</a> - Add instructions to the macOS DMG file. Improve overall user experience.</li>
<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/78">#78</a> - Fix crypto library linking issues in the Docker image.</li>
<li><a href="https://github.com/LMS-Community/slimserver-platforms/issues/80">#80</a> - Reset update status when updating fromt he macOS menu bar item.</li>
</ul>
Expand Down
1 change: 1 addition & 0 deletions Slim/Utils/OS/OSX.pm
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ sub initUpdate {
<string>$plistLabel</string>
<key>ProgramArguments</key>
<array>
<string>$^X</string>
<string>$script</string>
</array>
$envVariables
Expand Down

0 comments on commit 39d8337

Please sign in to comment.