Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-07-09 03:04:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Reverted Docker setup for Synology users and bumped to a hotfix number. This will match nightly users but will not share the same codebase. (#1836)

Browse Source
This commit is contained in:
Joe Milazzo 2023-02-24 10:26:20 -06:00 committed by GitHub
parent 30bc7cccef
commit 90c9e4954e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 36 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kavita.Common/Kavita.Common.csproj
View File

@ -3,7 +3,7 @@
<TargetFramework>net6.0</TargetFramework> <TargetFramework>net6.0</TargetFramework>
<Company>kavitareader.com</Company> <Company>kavitareader.com</Company>
<Product>Kavita</Product> <Product>Kavita</Product>
<AssemblyVersion>0.7.1.0</AssemblyVersion> <AssemblyVersion>0.7.1.4</AssemblyVersion>
<NeutralLanguage>en</NeutralLanguage> <NeutralLanguage>en</NeutralLanguage>
<TieredPGO>true</TieredPGO> <TieredPGO>true</TieredPGO>
</PropertyGroup> </PropertyGroup>

67
entrypoint.sh
View File

@ -1,18 +1,18 @@
#! /bin/bash #! /bin/bash
# Set default UID and GID for Kavita but allow overrides ## Set default UID and GID for Kavita but allow overrides
PUID=${PUID:-0} #PUID=${PUID:-0}
PGID=${PGID:-0} #PGID=${PGID:-0}
#
# Add Kavita group if it doesn't already exist ## Add Kavita group if it doesn't already exist
if [[ -z "$(getent group "$PGID" | cut -d':' -f1)" ]]; then #if [[ -z "$(getent group "$PGID" | cut -d':' -f1)" ]]; then
groupadd -o -g "$PGID" kavita # groupadd -o -g "$PGID" kavita
fi #fi
#
# Add Kavita user if it doesn't already exist ## Add Kavita user if it doesn't already exist
if [[ -z "$(getent passwd "$PUID" | cut -d':' -f1)" ]]; then #if [[ -z "$(getent passwd "$PUID" | cut -d':' -f1)" ]]; then
useradd -o -u "$PUID" -g "$PGID" -d /kavita kavita # useradd -o -u "$PUID" -g "$PGID" -d /kavita kavita
fi #fi
if [ ! -f "/kavita/config/appsettings.json" ]; then if [ ! -f "/kavita/config/appsettings.json" ]; then
echo "Kavita configuration file does not exist, creating..." echo "Kavita configuration file does not exist, creating..."
@ -24,24 +24,25 @@ fi
chmod +x Kavita chmod +x Kavita
if [[ "$PUID" -eq 0 ]]; then
# Run as root
./Kavita ./Kavita
else #if [[ "$PUID" -eq 0 ]]; then
# Set ownership on config dir if running non-root and current ownership is different # # Run as root
if [[ ! "$(stat -c %u /kavita/config)" = "$PUID" ]]; then # ./Kavita
echo "Specified PUID differs from Kavita config dir ownership, updating permissions now..." #else
if [[ ! "$(stat -c %g /kavita/config)" = "$PGID" ]]; then # # Set ownership on config dir if running non-root and current ownership is different
chown -R "$PUID":"$PGID" /kavita/config # if [[ ! "$(stat -c %u /kavita/config)" = "$PUID" ]]; then
else # echo "Specified PUID differs from Kavita config dir ownership, updating permissions now..."
chown -R "$PUID" /kavita/config # if [[ ! "$(stat -c %g /kavita/config)" = "$PGID" ]]; then
fi # chown -R "$PUID":"$PGID" /kavita/config
# else
elif [[ ! "$(stat -c %g /kavita/config)" = "$PGID" ]]; then # chown -R "$PUID" /kavita/config
echo "Specified PGID differs from Kavita config dir ownership, updating permissions now..." # fi
chgrp -R "$PGID" /kavita/config #
fi # elif [[ ! "$(stat -c %g /kavita/config)" = "$PGID" ]]; then
# echo "Specified PGID differs from Kavita config dir ownership, updating permissions now..."
# Run as non-root user # chgrp -R "$PGID" /kavita/config
su -l kavita -c ./Kavita # fi
fi #
# # Run as non-root user
# su -l kavita -c ./Kavita
#fi