Last active
August 29, 2015 14:06
-
-
Save joshka/84f1e7f5ecde7fed96c4 to your computer and use it in GitHub Desktop.
diff plexmediaserver 0.9.9.14.531-1 vs plexmediaserver-plexpass 0.9.9.16.555-1 aur package tarball
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -u plexmediaserver/.AURINFO plexmediaserver-plexpass/.AURINFO | |
--- plexmediaserver/.AURINFO 2014-08-04 23:25:13.000000000 +1000 | |
+++ plexmediaserver-plexpass/.AURINFO 2014-08-17 04:13:21.000000000 +1000 | |
@@ -1,24 +1,20 @@ | |
-pkgbase = plexmediaserver | |
- pkgdesc = Plex Media Server for Linux | |
- pkgver = 0.9.9.14.531 | |
+pkgbase = plexmediaserver-plexpass | |
+ pkgdesc = PlexPass Release of Plex Media Server for Linux | |
+ pkgver = 0.9.9.16.555 | |
pkgrel = 1 | |
- url = https://plex.tv/ | |
+ url = http://www.plexapp.com | |
install = plexmediaserver.install | |
arch = i686 | |
arch = x86_64 | |
license = closed | |
- depends = ffmpeg | |
- depends = ffmpeg-compat | |
- depends = libidn | |
- depends = libxslt | |
- depends = curl | |
- depends = python2 | |
- conflicts = plexmediaserver-plexpass | |
- source = http://downloads.plexapp.com/plex-media-server/0.9.9.14.531-7eef8c6/plexmediaserver_0.9.9.14.531-7eef8c6_.deb | |
+ depends = rsync | |
+ depends = avahi | |
+ conflicts = plexmediaserver | |
+ source = http://:@downloads.plexapp.com/plex-media-server/0.9.9.16.555-50cd0c3/plexmediaserver_0.9.9.16.555-50cd0c3_.deb | |
source = plexmediaserver.conf.d | |
source = plexmediaserver.service | |
source = start_pms | |
backup = etc/conf.d/plexmediaserver | |
-pkgname = plexmediaserver | |
+pkgname = plexmediaserver-plexpass | |
diff -u plexmediaserver/PKGBUILD plexmediaserver-plexpass/PKGBUILD | |
--- plexmediaserver/PKGBUILD 2014-08-04 23:22:31.000000000 +1000 | |
+++ plexmediaserver-plexpass/PKGBUILD 2014-08-17 04:11:36.000000000 +1000 | |
@@ -2,47 +2,60 @@ | |
# Contributor: Arthur <[email protected]> | |
# Contributor: Jon Wiersma <[email protected]> | |
# Contributor: monty <linksoft [at] gmx [dot] de> | |
+# Contributor: Mikhail Davidov <[email protected]> | |
# Contributor: Tom Moore <t.moore01 [at] gmail [dot] com> | |
-# Maintainer: Rob Sletten <rsletten [at] gmail [dot] com> | |
+# Maintainer: Matt Henkel <[email protected]> | |
-pkgname=plexmediaserver | |
-pkgver=0.9.9.14.531 | |
+pkgname=plexmediaserver-plexpass | |
+pkgver=0.9.9.16.555 | |
pkgrel=1 | |
-_subver=7eef8c6 | |
-pkgdesc="Plex Media Server for Linux" | |
-url='https://plex.tv/' | |
+_subver=50cd0c3 | |
+pkgdesc="PlexPass Release of Plex Media Server for Linux" | |
+url='http://www.plexapp.com' | |
arch=('i686' 'x86_64') | |
license=('closed') | |
-depends=('ffmpeg' 'ffmpeg-compat' 'libidn' 'libxslt' 'curl' 'python2') | |
-conflicts=('plexmediaserver-plexpass') | |
+depends=('rsync' 'avahi') | |
+conflicts=('plexmediaserver') | |
backup=('etc/conf.d/plexmediaserver') | |
install='plexmediaserver.install' | |
if [ "$CARCH" = "i686" ]; then | |
- _arch='i386' | |
- md5sums=('1f580f732e3e76134afdb4cd98e64dea') | |
+ _arch='i386' | |
+ md5sums=('5d6d95540837d7469f6849a12d4cbef2') | |
elif [ "$CARCH" = "x86_64" ]; then | |
- _arch='amd64' | |
- md5sums=('3bc1d1c2378332e054ff493d584b5e8b') | |
+ _arch='amd64' | |
+ md5sums=('016ec179e95b972ea57ff10f1f63f863') | |
fi | |
-source=("http://downloads.plexapp.com/plex-media-server/${pkgver}-${_subver}/${pkgname}_${pkgver}-${_subver}_${_arch}.deb" "${pkgname}.conf.d" "${pkgname}.service" "start_pms") | |
-md5sums+=('32cdd9f9de446f6646616a0077151726' | |
- 'd64ea728767856cf08d0261e11b8a9e1' | |
- '69efb2441c7971a9e546d76b51cd12cc') | |
+if (( !INFAKEROOT )); then | |
+ echo "This package requires that you are a PlexPass member and have access to the PlexPass forum and downloads (http://forums.plexapp.com/index.php/topic/64569-download-instructions/)" | |
+ echo | |
+ echo -n "Enter the user to download the package as: " | |
+ read user | |
+ echo -n "Enter the password for ${user}: " | |
+ read -s password | |
+ echo | |
+fi | |
+source=("http://${user}:${password}@downloads.plexapp.com/plex-media-server/${pkgver}-${_subver}/plexmediaserver_${pkgver}-${_subver}_${_arch}.deb" "plexmediaserver.conf.d" "plexmediaserver.service" "start_pms") | |
+md5sums+=('32cdd9f9de446f6646616a0077151726' | |
+ 'd850fe41dd35aba09a375ac8d81175e0' | |
+ '34e9ddaab4ffc84ab9835abd16a383b3') | |
build() { | |
- ar -xv plexmediaserver_${pkgver}-${_subver}_${_arch}.deb || return 1 | |
- tar -zxf data.tar.gz || return 1 | |
+ ar -xv plexmediaserver_${pkgver}-${_subver}_${_arch}.deb || return 1 | |
+ tar -zxf data.tar.gz || return 1 | |
} | |
package() { | |
- mkdir -p "${pkgdir}"/opt/plexmediaserver | |
- mkdir -p "${pkgdir}"/usr/lib/systemd/system | |
+ mkdir -p "${pkgdir}/opt/plexmediaserver" | |
+ mkdir -p "${pkgdir}/usr/lib/systemd/system" | |
- cp -r usr/lib/plexmediaserver/* "${pkgdir}"/opt/plexmediaserver/ | |
+ cp -r usr/lib/plexmediaserver/* "${pkgdir}/opt/plexmediaserver/" | |
- install -Dm755 ${srcdir}/start_pms "${pkgdir}"/opt/plexmediaserver/ | |
- install -Dm644 ${srcdir}/plexmediaserver.conf.d "${pkgdir}"/etc/conf.d/plexmediaserver | |
- install -Dm644 ${srcdir}/plexmediaserver.service "${pkgdir}"/usr/lib/systemd/system/plexmediaserver.service | |
+ install -Dm755 "${srcdir}/start_pms" "${pkgdir}/opt/plexmediaserver/" | |
+ install -Dm644 "${srcdir}/plexmediaserver.conf.d" "${pkgdir}/etc/conf.d/plexmediaserver" | |
+ install -Dm644 "${srcdir}/plexmediaserver.service" "${pkgdir}/usr/lib/systemd/system/plexmediaserver.service" | |
} | |
+ | |
+# vim: set ts=4 sts=4 sw=4 ai et: | |
+ | |
diff -u plexmediaserver/plexmediaserver.install plexmediaserver-plexpass/plexmediaserver.install | |
--- plexmediaserver/plexmediaserver.install 2014-06-22 00:19:14.000000000 +1000 | |
+++ plexmediaserver-plexpass/plexmediaserver.install 2013-09-07 06:15:48.000000000 +1000 | |
@@ -8,10 +8,9 @@ | |
fi | |
fi; | |
-# Now to fix broken items from plexapp.com | |
+ # Now to fix broken items from plexapp.com | |
rm -f /opt/plexmediaserver/start.sh | |
. /etc/conf.d/plexmediaserver | |
- ln -s ${PLEX_MEDIA_SERVER_HOME}/start_pms ${PLEX_MEDIA_SERVER_HOME}/start.sh | |
if [ ! -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" ]; | |
then | |
@@ -36,8 +35,6 @@ | |
fi | |
systemctl --system daemon-reload | |
- # echo "Starting plexmediaserver..." | |
- # systemctl start plexmediaserver | |
cat << "EOM" | |
#### | |
# Installation done | |
@@ -69,8 +66,10 @@ | |
systemctl --system daemon-reload | |
. /etc/conf.d/plexmediaserver | |
rm -f ${PLEX_MEDIA_SERVER_HOME}/start.sh | |
- ln -s ${PLEX_MEDIA_SERVER_HOME}/start_pms ${PLEX_MEDIA_SERVER_HOME}/start.sh | |
- chown -R ${PLEX_MEDIA_SERVER_USER} ${PLEX_MEDIA_SERVER_HOME} & | |
- #echo "Starting plexmediaserver..." | |
- #systemctl start plexmediaserver | |
+ echo "Fixing permissions. This can take several minutes, be patient." | |
+ chown -R ${PLEX_MEDIA_SERVER_USER} ${PLEX_MEDIA_SERVER_HOME} | |
+ echo "Restarting Plexmediaserver" | |
+ systemctl start plexmediaserver | |
} | |
+ | |
+# vim: set ts=2 sw=2 sts=2 ai et: | |
diff -u plexmediaserver/plexmediaserver.service plexmediaserver-plexpass/plexmediaserver.service | |
--- plexmediaserver/plexmediaserver.service 2014-06-21 23:23:01.000000000 +1000 | |
+++ plexmediaserver-plexpass/plexmediaserver.service 2013-09-07 07:30:44.000000000 +1000 | |
@@ -7,7 +7,6 @@ | |
ExecStart=/opt/plexmediaserver/start_pms | |
KillMode=process | |
Type=forking | |
-Restart=on-failure | |
[Install] | |
WantedBy=multi-user.target | |
diff -u plexmediaserver/start_pms plexmediaserver-plexpass/start_pms | |
--- plexmediaserver/start_pms 2014-03-16 00:37:14.000000000 +1100 | |
+++ plexmediaserver-plexpass/start_pms 2013-07-13 13:00:41.000000000 +1000 | |
@@ -10,17 +10,6 @@ | |
test -f /etc/conf.d/plexmediaserver && . /etc/conf.d/plexmediaserver | |
-#if [ -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" ] | |
-#then | |
-# chown -R ${PLEX_MEDIA_SERVER_USER} "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" | |
-# if [ ! $? -eq 0 ] | |
-# then | |
-# echo "WARNING COULDN'T CHOWN $PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR files to ${PLEX_MEDIA_SERVER_USER}, MAKE SURE I HAVE PERMISSON TO DO THAT!" | |
-# exit 1 | |
-# fi | |
-#fi | |
- | |
- | |
if [ ! -d "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" ] | |
then | |
mkdir -p "$PLEX_MEDIA_SERVER_APPLICATION_SUPPORT_DIR" |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment