Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

More branding action.

  • Loading branch information...
commit ed4f342625b4f28e1c316c06056a36f72f89e5dc 1 parent 165ba7f
@gewalker authored
View
30 Makefile.in
@@ -136,8 +136,8 @@ INCLUDES=$(sort @INCLUDES@)
CLEAN_FILES=xbmc.bin xbmc-xrandr
-DISTCLEAN_FILES=config.h config.log config.status tools/Linux/xbmc.sh \
- tools/Linux/xbmc-standalone.sh autom4te.cache config.h.in~ \
+DISTCLEAN_FILES=config.h config.log config.status tools/Linux/plex.sh \
+ tools/Linux/plex-standalone.sh autom4te.cache config.h.in~ \
xbmc/lib/libPython/Python/Include/pyconfig.h \
xbmc/lib/libPython/Python/configure.lineno \
xbmc/lib/libPython/Python/libpython2.4.so.1.0 \
@@ -500,7 +500,7 @@ livedatas:
$(MAKE) -C tools/XBMCLive
install-bin: xbmc.bin # developement convenience target
- sudo install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc
+ sudo install -D xbmc.bin $(DESTDIR)$(libdir)/pmc
ifeq ($(findstring osx,$(ARCH)), osx)
# TODO: add osx install
@@ -511,7 +511,7 @@ install-binaries: install-scripts
@echo "Copying XBMC binary to $(DESTDIR)$(libdir)/xbmc/xbmc.bin"
@install -D xbmc.bin $(DESTDIR)$(libdir)/xbmc/xbmc.bin
@install -D xbmc-xrandr $(DESTDIR)$(libdir)/xbmc/xbmc-xrandr
- @echo "You can run XBMC with the command 'xbmc'"
+ @echo "You can run Plex Media Center with the command 'pmc'"
endif
install-arch:
@@ -521,10 +521,10 @@ install-arch:
@cp -r addons/script.module.pysqlite $(DESTDIR)$(libdir)/xbmc/addons/
install-scripts:
- @install -D tools/Linux/xbmc.sh $(DESTDIR)$(bindir)/xbmc
- @install -D tools/Linux/xbmc-standalone.sh $(DESTDIR)$(bindir)/xbmc-standalone
+ @install -D tools/Linux/plex.sh $(DESTDIR)$(bindir)/pmc
+ @install -D tools/Linux/plex-standalone.sh $(DESTDIR)$(bindir)/pmc-standalone
@install -D -m 0644 tools/Linux/FEH.py $(DESTDIR)$(datarootdir)/xbmc/FEH.py
- @install -D -m 0644 tools/Linux/xbmc-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/XBMC.desktop
+ @install -D -m 0644 tools/Linux/plex-xsession.desktop $(DESTDIR)$(datarootdir)/xsessions/Plex.desktop
install-datas: install-scripts
@echo "Copying support and legal files..."
@@ -536,9 +536,9 @@ install-datas: install-scripts
@find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*script\.module\..*|.*$(ARCH).*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r"
@# Icons and links
@mkdir -p $(DESTDIR)$(datarootdir)/applications
- @cp -a tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/
- @install -D -m 0644 tools/Linux/xbmc-48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png
- @install -D -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png
+ @cp -a tools/Linux/plex.desktop $(DESTDIR)$(datarootdir)/applications/
+ @install -D -m 0644 tools/Linux/plex-48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/plex.png
+ @install -D -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/plex.png
@test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || :
install-livedatas: livedatas
@@ -551,18 +551,18 @@ install-livedatas: livedatas
uninstall:
@echo "Removing XBMC..."
- @rm -rf $(DESTDIR)$(libdir)/xbmc
+ @rm -rf $(DESTDIR)$(libdir)/pmc
@rm -rf $(DESTDIR)$(datarootdir)/xbmc $(DESTDIR)$(bindir)/xbmc
- @rm -rf $(DESTDIR)$(bindir)/xbmc-standalone
- @rm -rf $(DESTDIR)$(datarootdir)/xsessions/XBMC.desktop
+ @rm -rf $(DESTDIR)$(bindir)/pmc-standalone
+ @rm -rf $(DESTDIR)$(datarootdir)/xsessions/Plex.desktop
@echo "Done!"
reallyclean:
@echo " This will delete ALL unversioned files in"; \
- echo " your XBMC source tree. If you aren't sure"; \
+ echo " your Plex Media Center source tree. If you aren't sure"; \
echo " you want to do this, answer anything but"; \
echo " 'Y' (case sensitive) to the following."; \
- echo " DISCLAIMER: Team XBMC is NOT responsible"; \
+ echo " DISCLAIMER: Plex, Inc. is NOT responsible"; \
echo " for ANYTHING lost if you execute this command!"; \
echo -n " Damnserious? (Y/*) "; \
read -n1 PROMPT; \
View
8 tools/Linux/xbmc.desktop → tools/Linux/Plex.desktop
@@ -1,10 +1,10 @@
[Desktop Entry]
Version=1.0
-Name=XBMC Media Center
-GenericName=Media Center
+Name=Plex Media Center
+GenericName=Plex Media Center
Comment=Manage and view your media
-Exec=xbmc
-Icon=xbmc
+Exec=plex
+Icon=plex
Terminal=false
Type=Application
Categories=AudioVideo;Video;Player;TV;
View
BIN  tools/Linux/plex-48x48.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
57 tools/Linux/plex-standalone.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# Copyright (C) 2009-2010 Team XBMC
+# http://www.xbmc.org
+#
+# This Program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This Program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with XBMC; see the file COPYING. If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# http://www.gnu.org/copyleft/gpl.html
+
+XBMC="xbmc --standalone \"$@\""
+
+PULSE_START="$(which start-pulseaudio-x11)"
+if [ -n "$PULSE_START" ]; then
+ $PULSE_START
+else
+ PULSE_SESSION="$(which pulse-session)"
+ if [ -n "$PULSE_SESSION" ]; then
+ XBMC="$PULSE_SESSION $XBMC"
+ fi
+fi
+
+LOOP=1
+CRASHCOUNT=0
+LASTSUCCESSFULSTART=$(date +%s)
+
+while [ $(( $LOOP )) = "1" ]
+do
+ $XBMC
+ RET=$?
+ NOW=$(date +%s)
+ if [ $(( ($RET >= 64 && $RET <=66) || $RET == 0 )) = "1" ]; then # clean exit
+ LOOP=0
+ else # crash
+ DIFF=$((NOW-LASTSUCCESSFULSTART))
+ if [ $(($DIFF > 60 )) = "1" ]; then # Not on startup, ignore
+ LASTSUCESSFULSTART=$NOW
+ CRASHCOUNT=0
+ else # at startup, look sharp
+ CRASHCOUNT=$((CRASHCOUNT+1))
+ if [ $(($CRASHCOUNT >= 3)) = "1" ]; then # Too many, bail out
+ LOOP=0
+ echo "XBMC has exited uncleanly 3 times in the ${DIFF}s. Something is probably wrong"
+ fi
+ fi
+ fi
+done
View
0  tools/Linux/xbmc-standalone.sh.in → tools/Linux/plex-standalone.sh.in
File renamed without changes
View
6 tools/Linux/plex-xsession.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Plex
+Comment=This session will start Plex Media Center
+Exec=plex-standalone
+TryExec=plex-standalone
+Type=Application
View
135 tools/Linux/plex.sh
@@ -0,0 +1,135 @@
+#!/bin/sh
+
+# Copyright (C) 2008-2010 Team XBMC
+# http://www.xbmc.org
+#
+# This Program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This Program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with XBMC; see the file COPYING. If not, write to
+# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+# http://www.gnu.org/copyleft/gpl.html
+
+SAVED_ARGS="$@"
+prefix="/usr"
+exec_prefix="${prefix}"
+datarootdir="${prefix}/share"
+LIBDIR="${exec_prefix}/lib"
+
+# Check for some options used by this script
+while [ "$#" -gt "0" ]
+do
+ case "$1" in
+ --setlibdir)
+ LIBDIR="$2"
+ shift; shift
+ ;;
+ *)
+ shift
+ ;;
+ esac
+done
+
+single_stacktrace()
+{
+ # core filename is either "core.$PID" or "core"
+ find "$1" -maxdepth $2 -name 'core*' | while read core; do
+ LC_ALL=C gdb --core="$core" --batch 2> /dev/null | grep -q "^Core was generated by \`$LIBDIR/xbmc/xbmc.bin" || continue
+ echo "=====> Core file: "$core" ($(stat -c%y "$core"))" >> $FILE
+ echo " =========================================" >> $FILE
+ gdb "$LIBDIR/xbmc/xbmc.bin" --core="$core" --batch -ex "thread apply all bt" 2> /dev/null >> $FILE
+ rm -f "$core"
+ done
+}
+
+print_crash_report()
+{
+ FILE="$HOME/xbmc_crashlog-`date +%Y%m%d_%H%M%S`.log"
+ echo "############## XBMC CRASH LOG ###############" >> $FILE
+ echo >> $FILE
+ echo "################ SYSTEM INFO ################" >> $FILE
+ echo -n " Date: " >> $FILE
+ date >> $FILE
+ echo " XBMC Options: $*" >> $FILE
+ echo -n " Arch: " >> $FILE
+ uname -m >> $FILE
+ echo -n " Kernel: " >> $FILE
+ uname -rvs >> $FILE
+ echo -n " Release: " >> $FILE
+ if which lsb_release > /dev/null; then
+ echo >> $FILE
+ lsb_release -a 2> /dev/null | sed -e 's/^/ /' >> $FILE
+ else
+ echo "lsb_release not available" >> $FILE
+ fi
+ echo "############## END SYSTEM INFO ##############" >> $FILE
+ echo >> $FILE
+ echo "############### STACK TRACE #################" >> $FILE
+ single_stacktrace "$PWD" 1
+ # Find in plugins directories
+ if [ $XBMC_HOME ]; then
+ BASEDIR=$XBMC_HOME
+ else
+ BASEDIR="$LIBDIR/xbmc/"
+ fi
+ single_stacktrace "$BASEDIR" 5
+ # find in user xbmc dir
+ single_stacktrace $HOME/.xbmc/ 5
+ echo "############# END STACK TRACE ###############" >> $FILE
+ echo >> $FILE
+ echo "################# LOG FILE ##################" >> $FILE
+ echo >> $FILE
+ if [ -f ~/.xbmc/temp/xbmc.log ]
+ then
+ cat ~/.xbmc/temp/xbmc.log >> $FILE
+ echo >> $FILE
+ else
+ echo "Logfile not found in the usual place." >> $FILE
+ echo "Please attach it seperately." >> $FILE
+ echo "Use pastebin.com or similar for forums or IRC." >> $FILE
+ fi
+ echo >> $FILE
+ echo "############### END LOG FILE ################" >> $FILE
+ echo >> $FILE
+ echo "############ END XBMC CRASH LOG #############" >> $FILE
+ echo "Crash report available at $FILE"
+}
+
+python ${datarootdir}/xbmc/FEH.py $SAVED_ARGS
+RET=$?
+if [ $RET -ne 0 ]; then
+ exit $RET
+fi
+
+if which gdb >/dev/null 2>&1; then
+ # Output warning in case ulimit is unsupported by shell
+ eval ulimit -c unlimited
+ if [ ! $? = "0" ]; then
+ echo "xbmc: ulimit is unsupported by this shell" 1>&2
+ fi
+fi
+
+LOOP=1
+while [ $(( $LOOP )) = "1" ]
+do
+ LOOP=0
+ "$LIBDIR/xbmc/xbmc.bin" $SAVED_ARGS
+ RET=$?
+ if [ $(( $RET == 65 )) = "1" ]
+ then # User requested to restart app
+ LOOP=1
+ elif [ $(( ($RET >= 131 && $RET <= 136) || $RET == 139 )) = "1" ]
+ then # Crashed with core dump
+ print_crash_report
+ fi
+done
+
+exit $RET
View
4 tools/Linux/xbmc.sh.in → tools/Linux/plex.sh.in
@@ -87,9 +87,9 @@ print_crash_report()
echo >> $FILE
echo "################# LOG FILE ##################" >> $FILE
echo >> $FILE
- if [ -f ~/.xbmc/temp/xbmc.log ]
+ if [ -f ~/.plex/temp/xbmc.log ]
then
- cat ~/.xbmc/temp/xbmc.log >> $FILE
+ cat ~/.plex/temp/xbmc.log >> $FILE
echo >> $FILE
else
echo "Logfile not found in the usual place." >> $FILE
View
6 tools/Linux/xbmc-xsession.desktop
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=XBMC
-Comment=This session will start XBMC Media Center
-Exec=xbmc-standalone
-TryExec=xbmc-standalone
-Type=Application
Please sign in to comment.
Something went wrong with that request. Please try again.