Skip to content

Commit

Permalink
Fixed for PMS 1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
wnielson committed Aug 21, 2016
1 parent 64f0ef1 commit 4523c87
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Upgrading `Plex Media Server` often breaks things and it takes us some time to f

## Releases

For versions of Plex Media Server below version 1.1.0. use release [0.3.5](https://github.com/wnielson/Plex-Remote-Transcoder/releases/tag/0.3.5). For the newest version of Plex Media Server, use the main$

For versions of Plex Media Server below version 1.0, use release [0.2.2](https://github.com/wnielson/Plex-Remote-Transcoder/releases/tag/0.2.2). For the newest version of Plex Media Server, use the main branch or the [newest release](https://github.com/wnielson/Plex-Remote-Transcoder/releases).

## Contributing
Expand Down
8 changes: 4 additions & 4 deletions prt.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@

if sys.platform == "darwin":
# OS X
TRANSCODER_DIR = "/Applications/Plex Media Server.app/Contents/Resources/"
TRANSCODER_DIR = "/Applications/Plex Media Server.app/Contents/"
elif sys.platform.startswith('linux'):
# Linux
TRANSCODER_DIR = "/usr/lib/plexmediaserver/Resources/"
TRANSCODER_DIR = "/usr/lib/plexmediaserver/"
else:
raise NotImplementedError("This platform is not yet supported")

Expand Down Expand Up @@ -93,7 +93,7 @@
SSH_HOST_RE = re.compile(r'ssh +([^@]+)@([^ ]+)')

__author__ = "Weston Nielson <wnielson@github>"
__version__ = "0.3.5"
__version__ = "0.4.0"


def get_config():
Expand Down Expand Up @@ -237,7 +237,7 @@ def overwrite_transcoder_after_upgrade():
def build_env(host=None):
# TODO: This really should be done in a way that is specific to the target
# in the case that the target is a different architecture than the host
ffmpeg_path = os.environ["FFMPEG_EXTERNAL_LIBS"]
ffmpeg_path = os.environ.get("FFMPEG_EXTERNAL_LIBS", "")
backslashcheck = re.search(r'\\', ffmpeg_path)
if backslashcheck is not None:
ffmpeg_path_fixed = ffmpeg_path.replace('\\','')
Expand Down

0 comments on commit 4523c87

Please sign in to comment.