[rkward-cvs] SF.net SVN: rkward:[3505] trunk/rkward/rkward

[tfry at users.sourceforge.net]

Revision: 3505
          http://rkward.svn.sourceforge.net/rkward/?rev=3505&view=rev
Author:   tfry
Date:     2011-04-04 11:04:20 +0000 (Mon, 04 Apr 2011)

Log Message:
-----------
Sigh. Reverting r3503 and r3504. See http://www.mail-archive.com/rkward-devel@lists.sourceforge.net/msg01298.html

Modified Paths:
--------------
    trunk/rkward/rkward/main.cpp
    trunk/rkward/rkward/rkward.bat.template
    trunk/rkward/rkward/rkward.sh.template

Modified: trunk/rkward/rkward/main.cpp
===================================================================
--- trunk/rkward/rkward/main.cpp	2011-04-03 11:50:54 UTC (rev 3504)
+++ trunk/rkward/rkward/main.cpp	2011-04-04 11:04:20 UTC (rev 3505)
@@ -54,6 +54,7 @@
 #include <kaboutdata.h>
 #include <klocale.h>
 #include <ktemporaryfile.h>
+#include <kstandarddirs.h>
 
 #include <qstring.h>
 #include <QMutex>
@@ -164,6 +165,11 @@
 	}
 	args->clear();
 
+	// Usually, KDE always adds the current directory to the list of prefixes.
+	// However, since RKWard 0.5.6, the main binary is in KDE's libexec dir, which defies this mechanism. Therefore, RKWARD_ENSURE_PREFIX is set from the wrapper script.
+	char *add_path = getenv ("RKWARD_ENSURE_PREFIX");
+	if (add_path) KGlobal::dirs ()->addPrefix (QString::fromLocal8Bit (add_path));
+
 	// do it!
 	int status = app.exec ();
 

Modified: trunk/rkward/rkward/rkward.bat.template
===================================================================
--- trunk/rkward/rkward/rkward.bat.template	2011-04-03 11:50:54 UTC (rev 3504)
+++ trunk/rkward/rkward/rkward.bat.template	2011-04-04 11:04:20 UTC (rev 3505)
@@ -16,10 +16,7 @@
 
 ECHO Starting RKWard
 SET RKWARD.BIN=%~dsp0\..\lib\kde4\libexec\rkward.frontend.exe
-IF %KDEDIRS% == "" GOTO add
-SET KDEDRIS="%KDEDRIS%;"
-:add
-SET KDEDIRS="%KDEDRIS%%~dsp0\.."
+SET RKWARD_ENSURE_PREFIX=%~dsp0\..
 SET DEBUGGER=
 
 IF NOT "%1" == "--debugger" GOTO run

Modified: trunk/rkward/rkward/rkward.sh.template
===================================================================
--- trunk/rkward/rkward/rkward.sh.template	2011-04-03 11:50:54 UTC (rev 3504)
+++ trunk/rkward/rkward/rkward.sh.template	2011-04-04 11:04:20 UTC (rev 3505)
@@ -49,14 +49,7 @@
   rkward_binary="`dirname $0`/rkward.frontend"
 else
   # for regular installations
-  # Usually, KDE always adds the current directory to the list of prefixes.
-  # However, since RKWard 0.5.6, the main binary is in KDE's libexec dir, which defies this mechanism. Therefore, we need to make sure, KDEDIRS is set appropriately
-  EFFECTIVE_PREFIX="`dirname $0`/.."
-  if [ -z "${KDEDIRS}" ]; then
-    export KDEDIRS="${EFFECTIVE_PREFIX}"
-  else
-    export KDEDIRS="${EFFECTIVE_PREFIX}:${KDEDIRS}"
-  fi
+  export RKWARD_ENSURE_PREFIX="`dirname $0`/.."
   rkward_binary="@LIBEXEC_INSTALL_DIR@/rkward.frontend"
 fi
 exec $R_binary CMD $debugger ${rkward_binary} "$@"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.