Make init scripts Python version agnostic

Now that the Tautulli will run on both major versions of Python we can 
remove the specificity in the init scripts and make them simpler, with 
the added advantage that some OS's will now run Tautulli through Python 
3 instead of Python 2.
This commit is contained in:
Landon Abney 2020-03-28 16:31:14 -07:00
parent 155b98bb0c
commit 4edd2001b3
No known key found for this signature in database
GPG key ID: 95BD13E1C8912E29
5 changed files with 9 additions and 13 deletions

View file

@ -9,7 +9,7 @@ All pull requests should be based on the `nightly` branch, to minimize cross mer
### Python Code ### Python Code
#### Compatibility #### Compatibility
The code should work with Python 2.7. Note that Tautulli runs on many different platforms. The code should work with Python 2.7.17 or Python 3.6+. Note that Tautulli runs on many different platforms.
Re-use existing code. Do not hesitate to add logging in your code. You can the logger module `plexpy.logger.*` for this. Web requests are invoked via `plexpy.request.*` and derived ones. Use these methods to automatically add proper and meaningful error handling. Re-use existing code. Do not hesitate to add logging in your code. You can the logger module `plexpy.logger.*` for this. Web requests are invoked via `plexpy.request.*` and derived ones. Use these methods to automatically add proper and meaningful error handling.
@ -38,4 +38,4 @@ HTML5 compatible browsers are targeted.
* 4 space indentation * 4 space indentation
* `methodName` * `methodName`
* `variableName` * `variableName`
* `ClassName` * `ClassName`

View file

@ -1,8 +1,4 @@
#!/bin/sh #!/usr/bin/env python
''''which python >/dev/null 2>&1 && exec python "$0" "$@" # '''
''''which python2 >/dev/null 2>&1 && exec python2 "$0" "$@" # '''
''''which python2.7 >/dev/null 2>&1 && exec python2.7 "$0" "$@" # '''
''''exec echo "Error: Python not found!" # '''
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-

View file

@ -21,8 +21,8 @@ datadir=/opt/Tautulli
configfile=/opt/Tautulli/config.ini configfile=/opt/Tautulli/config.ini
pidfile=/var/run/tautulli.pid pidfile=/var/run/tautulli.pid
nice= nice=
# The following line must point to your Python 2.7 install # The following line must point to your Python installation
python27=/usr/src/Python-2.7.11/python python=/usr/bin/python
## ##
options=" --daemon --config $configfile --pidfile $pidfile --datadir $datadir --nolaunch --quiet" options=" --daemon --config $configfile --pidfile $pidfile --datadir $datadir --nolaunch --quiet"
@ -30,7 +30,7 @@ options=" --daemon --config $configfile --pidfile $pidfile --datadir $datadir --
start() { start() {
# Start daemon. # Start daemon.
echo -n $"Starting $prog: " echo -n $"Starting $prog: "
daemon --pidfile=$pidfile $nice $python27 $homedir/Tautulli.py $options daemon --pidfile=$pidfile $nice $python $homedir/Tautulli.py $options
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && touch $lockfile [ $RETVAL -eq 0 ] && touch $lockfile
@ -39,7 +39,7 @@ start() {
stop() { stop() {
echo -n $"Shutting down $prog: " echo -n $"Shutting down $prog: "
killproc -p $pidfile $python27 killproc -p $pidfile $python
RETVAL=$? RETVAL=$?
echo echo
[ $RETVAL -eq 0 ] && rm -f $lockfile [ $RETVAL -eq 0 ] && rm -f $lockfile

View file

@ -51,7 +51,7 @@ verify_tautulli_pid() {
# Make sure the pid corresponds to the Tautulli process. # Make sure the pid corresponds to the Tautulli process.
if [ -f ${tautulli_pid} ]; then if [ -f ${tautulli_pid} ]; then
pid=`cat ${tautulli_pid} 2>/dev/null` pid=`cat ${tautulli_pid} 2>/dev/null`
ps -p ${pid} | grep -q "python2 ${tautulli_dir}/Tautulli.py" ps -p ${pid} | grep -q "python ${tautulli_dir}/Tautulli.py"
return $? return $?
else else
return 0 return 0

View file

@ -51,7 +51,7 @@ verify_tautulli_pid() {
# Make sure the pid corresponds to the Tautulli process. # Make sure the pid corresponds to the Tautulli process.
if [ -f ${tautulli_pid} ]; then if [ -f ${tautulli_pid} ]; then
pid=`cat ${tautulli_pid} 2>/dev/null` pid=`cat ${tautulli_pid} 2>/dev/null`
ps -p ${pid} | grep -q "python2 ${tautulli_dir}/Tautulli.py" ps -p ${pid} | grep -q "python ${tautulli_dir}/Tautulli.py"
return $? return $?
else else
return 0 return 0