[PC-BSD Commits] r19047 - pcbsd-projects/PCDM

[svn at pcbsd.org]

Author: kenmoore
Date: 2012-09-11 16:48:36 +0000 (Tue, 11 Sep 2012)
New Revision: 19047

Modified:
   pcbsd-projects/PCDM/pcdm-backend.cpp
Log:
Fix a bug in the login script startup, needed absolute paths.



Modified: pcbsd-projects/PCDM/pcdm-backend.cpp
===================================================================
--- pcbsd-projects/PCDM/pcdm-backend.cpp	2012-09-11 16:32:02 UTC (rev 19046)
+++ pcbsd-projects/PCDM/pcdm-backend.cpp	2012-09-11 16:48:36 UTC (rev 19047)
@@ -95,11 +95,12 @@
   //Use the saved information
   QString cmd = "su "+saveUsername+" -c \""; //switch user command to start process properly
   // Get any startup scripts and append them to the startup command
-  QDir sdir(Config::loginScriptsDir());
+  QString scriptDir = Config::loginScriptsDir();
+  QDir sdir(scriptDir);
+  if(!scriptDir.endsWith("/")){scriptDir.append("/");}
   QStringList child = sdir.entryList(QDir::Files | QDir::Executable | QDir::NoDotAndDotDot);
-  if(!child.isEmpty()){
-    cmd.append(child.join("; "));
-    cmd.append("; ");
+  for(int i=0; i<child.length(); i++){
+    cmd.append( scriptDir+child[i]+"; " );
   }
   //Add the DE startup command to the end
   cmd.append(saveX);