banshee r4906 - in trunk/banshee: . src/Clients/Booter

[abock svn gnome org]

Author: abock
Date: Sun Jan 11 07:27:01 2009
New Revision: 4906
URL: http://svn.gnome.org/viewvc/banshee?rev=4906&view=rev

Log:
2009-01-11  Aaron Bockover  <abock gnome org>

    * src/Clients/Booter/banshee-1.in: Use XDG_CONFIG_HOME instead of an
    explicit ~/.config; do not allow --redirect-log if another banshee-1
    process is running (this overwrites the original log); and allow for
    a special file ~/.config/banshee-1/always-debug that if present always
    will turn on debug mode, useful for when launched from a desktop file/GUI



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/src/Clients/Booter/banshee-1.in

Modified: trunk/banshee/src/Clients/Booter/banshee-1.in
==============================================================================
--- trunk/banshee/src/Clients/Booter/banshee-1.in	(original)
+++ trunk/banshee/src/Clients/Booter/banshee-1.in	Sun Jan 11 07:27:01 2009
@@ -4,12 +4,14 @@
 libdir= expanded_libdir@
 exec_asm="Banshee.exe"
 MONO_EXE="@expanded_libdir@/@PACKAGE@/$exec_asm"
+BANSHEE_EXEC_NAME="banshee-1"
+BANSHEE_CONFIG_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/banshee-1"
 
 export DYLD_LIBRARY_PATH= expanded_libdir@:@expanded_libdir@/@PACKAGE ${DYLD_LIBRARY_PATH+:$DYLD_LIBRARY_PATH}
 export LD_LIBRARY_PATH= expanded_libdir@:@expanded_libdir@/@PACKAGE ${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}
 export GST_PLUGIN_PATH= expanded_libdir@/@PACKAGE@/gstreamer-0.10${GST_PLUGIN_PATH+:$GST_PLUGIN_PATH}
 
-[ -n "$BANSHEE_DEBUG" ] && BANSHEE_DEBUG="--debug"
+[ -n "$BANSHEE_DEBUG" -o -f "${BANSHEE_CONFIG_DIR}/always-debug" ] && BANSHEE_DEBUG="--debug"
 [ -n "$BANSHEE_TRACE" ] && BANSHEE_TRACE="--trace=$BANSHEE_TRACE"
 [ -n "$BANSHEE_PROFILE" ] && BANSHEE_PROFILE="--profile=$BANSHEE_PROFILE"
 
@@ -27,7 +29,7 @@
     esac
 
 	case "x--redirect-log" in ("x$arg")
-		BANSHEE_REDIRECT_LOG="$HOME/.config/banshee-1/log"
+		[ -z "$(pidof $BANSHEE_EXEC_NAME)" ] && BANSHEE_REDIRECT_LOG="${BANSHEE_CONFIG_DIR}/log"
 	esac
 done
 
@@ -37,7 +39,7 @@
 fi
 
 # Finally - environment is set up, time to run our beloved
-exec_args="-a banshee-1 mono $MONO_OPTIONS $MONO_EXE"
+exec_args="-a $BANSHEE_EXEC_NAME mono $MONO_OPTIONS $MONO_EXE $BANSHEE_DEBUG"
 
 if [ -z "$BANSHEE_REDIRECT_LOG" ]; then
 	exec $exec_args "$@"