소스 검색

Tweakes based on review feedback

Joshua Boniface 6 년 전
부모
커밋
d4182e761c
3개의 변경된 파일6개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 1
      debian/changelog
  2. 1 3
      debian/conf/jellyfin
  3. 4 2
      debian/postrm

+ 1 - 1
debian/changelog

@@ -4,7 +4,7 @@ jellyfin (10.0.0-1) unstable; urgency=medium
   * Numerous bugfixes and code readability improvements
   * Numerous bugfixes and code readability improvements
   * Updated logging configuration, including flag for it and configdir
   * Updated logging configuration, including flag for it and configdir
   * Updated theming including logo
   * Updated theming including logo
-  * Dozens of other improvements as documented in PR#419
+  * Dozens of other improvements as documented in GitHub pull request #419
 
 
  -- Joshua Boniface <joshua@boniface.me>  Sat, 05 Jan 2019 15:39:25 -0500
  -- Joshua Boniface <joshua@boniface.me>  Sat, 05 Jan 2019 15:39:25 -0500
 
 

+ 1 - 3
debian/conf/jellyfin

@@ -15,11 +15,9 @@
 # General options
 # General options
 #
 #
 
 
-# Data directory
+# Program directories
 JELLYFIN_DATA_DIRECTORY="/var/lib/jellyfin"
 JELLYFIN_DATA_DIRECTORY="/var/lib/jellyfin"
-# Config directory
 JELLYFIN_CONFIG_DIRECTORY="/etc/jellyfin"
 JELLYFIN_CONFIG_DIRECTORY="/etc/jellyfin"
-# Logging directory
 JELLYFIN_LOG_DIRECTORY="/var/log/jellyfin"
 JELLYFIN_LOG_DIRECTORY="/var/log/jellyfin"
 # Restart script for in-app server control
 # Restart script for in-app server control
 JELLYFIN_RESTART_SCRIPT="/usr/lib/jellyfin/restart.sh"
 JELLYFIN_RESTART_SCRIPT="/usr/lib/jellyfin/restart.sh"

+ 4 - 2
debian/postrm

@@ -52,8 +52,10 @@ case "$1" in
     [[ -f /usr/bin/jellyfin ]] && rm /usr/bin/jellyfin
     [[ -f /usr/bin/jellyfin ]] && rm /usr/bin/jellyfin
     # Remove sudoers config
     # Remove sudoers config
     [[ -f /etc/sudoers.d/jellyfin-sudoers ]] && rm /etc/sudoers.d/jellyfin-sudoers
     [[ -f /etc/sudoers.d/jellyfin-sudoers ]] && rm /etc/sudoers.d/jellyfin-sudoers
-    # Remove /var/lib/jellyfin, just in case
-    [[ -d /var/lib/jellyfin ]] && rm -rf /var/lib/jellyfin
+    # Remove anything at the default locations; catches situations where the user moved the defaults
+    [[ -e /etc/jellyfin ]] && rm -rf /etc/jellyfin
+    [[ -e /var/log/jellyfin ]] && rm -rf /var/log/jellyfin
+    [[ -e /var/lib/jellyfin ]] && rm -rf /var/lib/jellyfin
     ;;
     ;;
   remove)
   remove)
     if [[ -x "/usr/bin/deb-systemd-helper" ]]; then
     if [[ -x "/usr/bin/deb-systemd-helper" ]]; then