[PC-BSD Commits] r17466 - in pcbsd/current/src-sh/de-info: . de-profiles

[svn at pcbsd.org]

Author: yurkis
Date: 2012-06-27 10:54:53 +0000 (Wed, 27 Jun 2012)
New Revision: 17466

Modified:
   pcbsd/current/src-sh/de-info/de-info
   pcbsd/current/src-sh/de-info/de-profiles/gnome.profile
   pcbsd/current/src-sh/de-info/de-profiles/kde.profile
   pcbsd/current/src-sh/de-info/de-profiles/lxde.profile
Log:
Improvements for terminal app in de-info

Modified: pcbsd/current/src-sh/de-info/de-info
===================================================================
--- pcbsd/current/src-sh/de-info/de-info	2012-06-27 09:17:59 UTC (rev 17465)
+++ pcbsd/current/src-sh/de-info/de-info	2012-06-27 10:54:53 UTC (rev 17466)
@@ -8,9 +8,10 @@
 SHOW_TERMINAL=0
 SHOW_FILEMAN=0
 
-DEFAULT_TERMINAL="xterm -e %s"
+DEFAULT_TERMINAL="xterm"
 DEFAULT_SUDO="pc-su %s"
-
+DEFAULT_TERMINAL_COMMAND="-e"
+DEFAULT_TERMINAL_TITLE="-T"
 display_help()
 {
   echo "de-info - display desktop environment info script"
@@ -42,8 +43,10 @@
     fi
       echo "XDG compatible: $XDG"
       echo "Sudo command: $DE_SU"  
+      echo "File manager: $DE_FILEMAN"
       echo "Terminal: $DE_TERMINAL"
-      echo "File manager: $DE_FILEMAN"
+      echo "Terminal title switch: $DE_TERMINAL_TITLE"
+      echo "Terminal command switch: $DE_TERMINAL_COMMAND"
 }
 
 parse_all()
@@ -55,6 +58,8 @@
   DE_SU=$DEFAULT_SUDO
   DE_FILEMAN=""
   DE_TERMINAL=$DEFAULT_TERMINAL
+  DE_TERMINAL_TITLE=$DEFAULT_TERMINAL_TITLE
+  DE_TERMINAL_COMMAND=$DEFAULT_TERMINAL_COMMAND
   DE_INSTALLED=0
   DE_ACTIVE=0
 
@@ -91,7 +96,7 @@
 
   if [ $DE_ACTIVE -eq 1 ] ; then
     if [ $SHOW_TERMINAL -eq 1 ] ; then
-      echo $DEFAULT_TERMINAL
+      echo "$DE_TERMINAL $DE_TERMINAL_COMMAND %s"
     else
       if [ $SHOW_FILEMAN -eq 1 ] ; then
         echo $DE_FILEMAN

Modified: pcbsd/current/src-sh/de-info/de-profiles/gnome.profile
===================================================================
--- pcbsd/current/src-sh/de-info/de-profiles/gnome.profile	2012-06-27 09:17:59 UTC (rev 17465)
+++ pcbsd/current/src-sh/de-info/de-profiles/gnome.profile	2012-06-27 10:54:53 UTC (rev 17466)
@@ -2,6 +2,9 @@
 XDG="YES"
 DE_SU="gksu %s"
 DE_FILEMAN="nautilus %s"
+DE_TERMINAL="gnome-terminal"
+DE_TERMINAL_TITLE="-T"
+DE_TERMINAL_COMMAND="-e"
 
 active() {
 if [ "$DESKTOP_SESSION" = "gnome" ] || [ "$DESKTOP_SESSION" = "02gnome" ] || [ "$DESKTOP_SESSION" = "openbox-gnome"  ] ; then

Modified: pcbsd/current/src-sh/de-info/de-profiles/kde.profile
===================================================================
--- pcbsd/current/src-sh/de-info/de-profiles/kde.profile	2012-06-27 09:17:59 UTC (rev 17465)
+++ pcbsd/current/src-sh/de-info/de-profiles/kde.profile	2012-06-27 10:54:53 UTC (rev 17466)
@@ -2,7 +2,9 @@
 XDG="YES"
 
 DE_SU="kdesu %s"
-DE_TERMINAL="konsole -e %s"
+DE_TERMINAL="konsole"
+DE_TERMINAL_TITLE="--caption"
+DE_TERMINAL_COMMAND="-e"
 DE_FILEMAN="dolphin %s"
 
 active() {

Modified: pcbsd/current/src-sh/de-info/de-profiles/lxde.profile
===================================================================
--- pcbsd/current/src-sh/de-info/de-profiles/lxde.profile	2012-06-27 09:17:59 UTC (rev 17465)
+++ pcbsd/current/src-sh/de-info/de-profiles/lxde.profile	2012-06-27 10:54:53 UTC (rev 17466)
@@ -3,6 +3,8 @@
 XDG="YES"
 DE_FILEMAN="pcmanfm %s"
 DE_TERMINAL="lxterminal"
+DE_TERMINAL_TITLE="-T"
+DE_TERMINAL_COMMAND="-e"
 
 active()
 {