From e9122b76ffd87dbcbe76d1e9149c48bb592de352 Mon Sep 17 00:00:00 2001 From: Joshua Boniface Date: Sun, 9 Dec 2018 19:09:43 -0500 Subject: [PATCH] A few more missing replacements of Emby --- debian/bin/jellyfin | 8 ++++---- debian/control | 2 +- debian/jellyfin.conf | 8 ++++---- debian/jellyfin.default | 8 ++++---- debian/jellyfin.init | 20 ++++++++++---------- debian/po/templates.pot | 20 ++++++++++---------- debian/postinst | 2 +- debian/postrm | 2 +- debian/preinst | 4 ++-- debian/prerm | 4 ++-- 10 files changed, 39 insertions(+), 39 deletions(-) diff --git a/debian/bin/jellyfin b/debian/bin/jellyfin index b9e23d05f4..7083e017a0 100644 --- a/debian/bin/jellyfin +++ b/debian/bin/jellyfin @@ -29,19 +29,19 @@ if [[ "$JELLYFIN_USER" != "jellyfin" ]]; then else echo "WARNING: The runas user is not part of jellyfin group and you don't have enough privileges to add it. The restart button in the GUI will probably fail." echo "To solve this start the jellyfin service using the startup scripts (systemd/sysv) or" - echo "add the runas user ($JELLYFIN_USER) to the jellyfin group manually and restart Emby." + echo "add the runas user ($JELLYFIN_USER) to the jellyfin group manually and restart Jellyfin." fi fi fi -# Data directory where Emby database, cache and logs are stored +# Data directory where Jellyfin database, cache and logs are stored PROGRAMDATA=$JELLYFIN_DATA PROGRAMDATA_OPT="-programdata $PROGRAMDATA" # Path to store PID file PIDFILE=$JELLYFIN_PIDFILE -# Full path of Emby binary +# Full path of Jellyfin binary JELLYFIN_EXEC=$JELLYFIN_BIN # Path of jellyfin program files @@ -66,7 +66,7 @@ MONO_EXEC_OPTS=$MONO_OPTS # restart function RESTART_OPTS="-restartpath ${JELLYFIN_PATH}/restart.sh" -# Emby options +# Jellyfin options JELLYFIN_OPTS="$PROGRAMDATA_OPT $RESTART_OPTS $JELLYFIN_ADD_OPTS" PID_PATH=$(dirname $PIDFILE) diff --git a/debian/control b/debian/control index f2a0969759..7d1e5de38d 100644 --- a/debian/control +++ b/debian/control @@ -13,5 +13,5 @@ Breaks: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server Conflicts: mediabrowser, emby, emby-server-beta, jellyfin-dev, emby-server Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends}, at, libsqlite3-0, dotnet-runtime-2.1 -Description: Emby Server is a home media server. +Description: Jellyfin is a home media server. It is built on top of other popular open source technologies such as Service Stack, jQuery, jQuery mobile, and Mono. It features a REST-based api with built-in documentation to facilitate client development. We also have client libraries for our api to enable rapid development. diff --git a/debian/jellyfin.conf b/debian/jellyfin.conf index 9772469e16..ef5c424e87 100644 --- a/debian/jellyfin.conf +++ b/debian/jellyfin.conf @@ -8,11 +8,11 @@ ## To change the defaults add any of the following settings below the comments ## -## JELLYFIN_USER= #$JELLYFIN_USER, username to run Emby under, the default is jellyfin -## JELLYFIN_GROUP= #$JELLYFIN_GROUP, Jellyfin group where Emby user belongs -## JELLYFIN_DIR= #$JELLYFIN_DIR, the location of Emby program files the default is /usr/lib/jellyfin +## JELLYFIN_USER= #$JELLYFIN_USER, username to run Jellyfin under, the default is jellyfin +## JELLYFIN_GROUP= #$JELLYFIN_GROUP, Jellyfin group where Jellyfin user belongs +## JELLYFIN_DIR= #$JELLYFIN_DIR, the location of Jellyfin program files the default is /usr/lib/jellyfin ## JELLYFIN_BIN= #$JELLYFIN_BIN, full path of MediaBrowser.Server.Mono.exe the default is /usr/lib/jellyfin/bin/MediaBrowser.Server.Mono.exe -## JELLYFIN_DATA= #$JELLYFIN_DATA, the location of Emby data, cache, logs, the default is /var/lib/jellyfin +## JELLYFIN_DATA= #$JELLYFIN_DATA, the location of Jellyfin data, cache, logs, the default is /var/lib/jellyfin ## JELLYFIN_PIDFILE= #$JELLYFIN_PIDFILE, the location of jellyfin.pid, the default is /var/run/jellyfin/jellyfin.pid ## JELLYFIN_ADD_OPTS= #$JELLYFIN_ADD_OPTS, additional options to pass to the Jellyfin executable, beyond ffmpeg, ffprobe and restart ## MONO_BIN= #$MONO_BIN, full path of mono binary, the default is /usr/bin/mono-sgen diff --git a/debian/jellyfin.default b/debian/jellyfin.default index 4fa0d67245..57f424c060 100644 --- a/debian/jellyfin.default +++ b/debian/jellyfin.default @@ -9,11 +9,11 @@ ## Don't edit this file ## Edit user configuration in /etc/jellyfin.conf to change ## -## JELLYFIN_USER= #$JELLYFIN_USER, username to run Emby under, the default is jellyfin -## JELLYFIN_GROUP= #$JELLYFIN_GROUP, Jellyfin group where Emby user belongs -## JELLYFIN_DIR= #$JELLYFIN_DIR, the location of Emby program files the default is /usr/lib/jellyfin +## JELLYFIN_USER= #$JELLYFIN_USER, username to run Jellyfin under, the default is jellyfin +## JELLYFIN_GROUP= #$JELLYFIN_GROUP, Jellyfin group where Jellyfin user belongs +## JELLYFIN_DIR= #$JELLYFIN_DIR, the location of Jellyfin program files the default is /usr/lib/jellyfin ## JELLYFIN_BIN= #$JELLYFIN_BIN, full path of MediaBrowser.Server.Mono.exe the default is /usr/lib/jellyfin/bin/MediaBrowser.Server.Mono.exe -## JELLYFIN_DATA= #$JELLYFIN_DATA, the location of Emby data, cache, logs, the default is /var/lib/jellyfin +## JELLYFIN_DATA= #$JELLYFIN_DATA, the location of Jellyfin data, cache, logs, the default is /var/lib/jellyfin ## JELLYFIN_PIDFILE= #$JELLYFIN_PIDFILE, the location of jellyfin.pid, the default is /var/run/jellyfin/jellyfin.pid ## JELLYFIN_ADD_OPTS= #$JELLYFIN_ADD_OPTS, additional options to pass to the Jellyfin executable, beyond ffmpeg, ffprobe and restart ## MONO_BIN= #$MONO_BIN, full path of mono binary, the default is /usr/bin/mono-sgen diff --git a/debian/jellyfin.init b/debian/jellyfin.init index da5cc4d6ad..4f23e13f07 100644 --- a/debian/jellyfin.init +++ b/debian/jellyfin.init @@ -1,40 +1,40 @@ ### BEGIN INIT INFO -# Provides: Emby Server +# Provides: Jellyfin Media Server # Required-Start: $local_fs $network # Required-Stop: $local_fs # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 -# Short-Description: Emby Server -# Description: Runs Emby Server +# Short-Description: Jellyfin Media Server +# Description: Runs Jellyfin Server ### END INIT INFO # Carry out specific functions when asked to by the system -pid=`ps -fA|grep dotnet|grep EmbyServer|awk '{print $2}'| tr -d '\n'` +pid=`ps -fA|grep dotnet|grep JellyfinServer|awk '{print $2}'| tr -d '\n'` case "$1" in start) if [ "$pid" == "" ]; then - echo "Starting Emby..." + echo "Starting Jellyfin..." nohup dotnet /usr/lib/jellyfin/bin/EmbyServer.dll >/dev/null 2>&1 & else - echo "Emby already running" + echo "Jellyfin already running" fi ;; stop) if [ "$pid" != "" ]; then - echo "Stopping Emby..." + echo "Stopping Jellyfin..." kill $pid sleep 2 else - echo "Emby not running" + echo "Jellyfin not running" fi ;; status) if [ "$pid" != "" ]; then - echo "Emby running as $pid" + echo "Jellyfin running as $pid" ps -f $pid else - echo "Emby is not running" + echo "Jellyfin is not running" fi ;; *) diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 03a98d3764..2cdcae4173 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -6,8 +6,8 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: emby-server\n" -"Report-Msgid-Bugs-To: emby-server@packages.debian.org\n" +"Project-Id-Version: jellyfin-server\n" +"Report-Msgid-Bugs-To: jellyfin-server@packages.debian.org\n" "POT-Creation-Date: 2015-06-12 20:51-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -20,38 +20,38 @@ msgstr "" #. Type: note #. Description #: ../templates:1001 -msgid "Emby permission info:" +msgid "Jellyfin permission info:" msgstr "" #. Type: note #. Description #: ../templates:1001 msgid "" -"Emby by default runs under a user named \"emby\". Please ensure that the " -"user emby has read and write access to any folders you wish to add to your " -"library. Otherwise please run emby under a different user." +"Jellyfin by default runs under a user named \"jellyfin\". Please ensure that the " +"user jellyfin has read and write access to any folders you wish to add to your " +"library. Otherwise please run jellyfin under a different user." msgstr "" #. Type: string #. Description #: ../templates:2001 -msgid "Username to run Emby as:" +msgid "Username to run Jellyfin as:" msgstr "" #. Type: string #. Description #: ../templates:2001 -msgid "The user that emby will run as." +msgid "The user that jellyfin will run as." msgstr "" #. Type: note #. Description #: ../templates:3001 -msgid "Emby still running" +msgid "Jellyfin still running" msgstr "" #. Type: note #. Description #: ../templates:3001 -msgid "Emby is currently running. Please close it and try again." +msgid "Jellyfin is currently running. Please close it and try again." msgstr "" diff --git a/debian/postinst b/debian/postinst index c2e46d4547..a32331da71 100644 --- a/debian/postinst +++ b/debian/postinst @@ -15,7 +15,7 @@ if [[ -f $CONF_FILE ]]; then . $CONF_FILE fi -# Data directory where Emby database, cache and logs are stored +# Data directory where Jellyfin database, cache and logs are stored PROGRAMDATA=${JELLYFIN_DATA-/var/lib/$NAME} case "$1" in diff --git a/debian/postrm b/debian/postrm index 69f527b1f8..852841b163 100644 --- a/debian/postrm +++ b/debian/postrm @@ -15,7 +15,7 @@ if [[ -f $CONF_FILE ]]; then . $CONF_FILE fi -# Data directory where Emby database, cache and logs are stored +# Data directory where Jellyfin database, cache and logs are stored PROGRAMDATA=${JELLYFIN_DATA-/var/lib/$NAME} # In case this system is running systemd, we make systemd reload the unit files diff --git a/debian/preinst b/debian/preinst index 7e168877e5..c53260bb06 100644 --- a/debian/preinst +++ b/debian/preinst @@ -15,7 +15,7 @@ if [[ -f $CONF_FILE ]]; then . $CONF_FILE fi -# Data directory where Emby database, cache and logs are stored +# Data directory where Jellyfin database, cache and logs are stored PROGRAMDATA=${JELLYFIN_DATA-/var/lib/$NAME} # In case this system is running systemd, we make systemd reload the unit files @@ -47,7 +47,7 @@ case "$1" in sleep 1 # if it's still running, show error if [[ -n "$(ps -p $JELLYFIN_PID -o pid=)" ]]; then - echo "Could not successfully stop EmbyServer, please do so before uninstalling." + echo "Could not successfully stop JellyfinServer, please do so before uninstalling." exit 1 else [[ -f $PIDFILE ]] && rm $PIDFILE diff --git a/debian/prerm b/debian/prerm index af8fa1aa2e..3cdffed79d 100644 --- a/debian/prerm +++ b/debian/prerm @@ -15,7 +15,7 @@ if [[ -f $CONF_FILE ]]; then . $CONF_FILE fi -# Data directory where Emby database, cache and logs are stored +# Data directory where Jellyfin database, cache and logs are stored PROGRAMDATA=${JELLYFIN_DATA-/var/lib/$NAME} case "$1" in @@ -41,7 +41,7 @@ case "$1" in sleep 1 # if it's still running, show error if [[ -n "$(ps -p $JELLYFIN_PID -o pid=)" ]]; then - echo "Could not successfully stop EmbyServer, please do so before uninstalling." + echo "Could not successfully stop Jellyfin, please do so before uninstalling." exit 1 else [[ -f $PIDFILE ]] && rm $PIDFILE