Merge branch 'develop' of https://github.com/Kareadita/Kavita into develop

This commit is contained in:
majora2007 2021-08-28 01:12:53 +00:00
commit d36c3d62ce
4 changed files with 10 additions and 2 deletions

View File

@ -117,6 +117,9 @@
<Content Remove="temp\**" /> <Content Remove="temp\**" />
<Content Remove="stats\**" /> <Content Remove="stats\**" />
<Content Condition=" '$(Configuration)' == 'Release' " Remove="appsettings.Development.json" /> <Content Condition=" '$(Configuration)' == 'Release' " Remove="appsettings.Development.json" />
<Content Update="appsettings.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@ -4,7 +4,7 @@
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<Company>kavitareader.com</Company> <Company>kavitareader.com</Company>
<Product>Kavita</Product> <Product>Kavita</Product>
<AssemblyVersion>0.4.4.5</AssemblyVersion> <AssemblyVersion>0.4.4.7</AssemblyVersion>
<NeutralLanguage>en</NeutralLanguage> <NeutralLanguage>en</NeutralLanguage>
</PropertyGroup> </PropertyGroup>

View File

@ -97,7 +97,6 @@ Package()
cp ../LICENSE "$lOutputFolder"/LICENSE.txt cp ../LICENSE "$lOutputFolder"/LICENSE.txt
echo "Renaming API -> Kavita" echo "Renaming API -> Kavita"
if [ $runtime == "win-x64" ] || [ $runtime == "win-x86" ] if [ $runtime == "win-x64" ] || [ $runtime == "win-x86" ]
then then
mv "$lOutputFolder"/API.exe "$lOutputFolder"/Kavita.exe mv "$lOutputFolder"/API.exe "$lOutputFolder"/Kavita.exe
@ -105,6 +104,9 @@ Package()
mv "$lOutputFolder"/API "$lOutputFolder"/Kavita mv "$lOutputFolder"/API "$lOutputFolder"/Kavita
fi fi
echo "Copying appsettings.json"
cp appsettings.Development.json $lOutputFolder/appsettings.json
echo "Creating tar" echo "Creating tar"
cd ../$outputFolder/"$runtime"/ cd ../$outputFolder/"$runtime"/
tar -czvf ../kavita-$runtime.tar.gz Kavita tar -czvf ../kavita-$runtime.tar.gz Kavita

View File

@ -56,6 +56,9 @@ Package()
echo "Show API structure" echo "Show API structure"
find find
echo "Copying appsettings.json"
cp appsettings.Development.json $lOutputFolder/appsettings.json
echo "Creating tar" echo "Creating tar"
cd ../$outputFolder/"$runtime"/ cd ../$outputFolder/"$runtime"/