Merge branch 'master' of pwrcvs:/data1/git/pwr

src/exp/com/src/os_linux/ge_javac.sh

-#! /bin/bash
+#!/bin/bash
 #
 # Proview   $Id: ge_javac.sh,v 1.5 2006-06-14 10:42:48 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.

src/exp/com/src/os_linux/jop_start.sh

+#!/bin/bash
 #
 # Proview   $Id: jop_start.sh,v 1.2 2005-09-01 14:57:49 claes Exp $
 # Copyright (C) 2005 SSAB Oxelösund AB.

src/exp/com/src/os_linux/pwr_cleanup.sh

+#!/bin/bash
 #
 # Proview   $Id: pwr_cleanup.sh,v 1.2 2005-09-01 14:57:49 claes Exp $
 # Copyright (C) 2005 SSAB Oxelösund AB.

src/exp/com/src/os_linux/pwr_stop.sh

+#!/bin/bash
 #
 # Proview   $Id: pwr_stop.sh,v 1.3 2008-11-24 15:22:42 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.

src/exp/com/src/os_linux/pwrp_env.sh

-#! /bin/bash
+#!/bin/bash
 #
 # Proview   $Id: pwrp_env.sh,v 1.15 2008-10-28 09:38:07 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.
@@ -922,6 +922,22 @@ pwrc_set_func()
     return
   fi
 
+  cmd="bus"
+  if [ $1 = $cmd ] || [ ${cmd#$1} != $cmd ]; then
+    # Command is "set bus"
+
+    bus_id=$2
+
+    if [ "$bus_id" == "" ]; then
+      if [ -e /etc/proview.cnf ]; then
+        bus_id=`eval cat /etc/proview.cnf | grep "\\bqcomBusId\\b" | awk '{print $2}'`
+      fi
+    fi
+    export PWR_BUS_ID=$bus_id
+    pwrc_status=$pwrc__success
+    return
+  fi
+
   if [ $1 = "db" ]; then
     pwrc_setdb_func $2
   else

src/exp/com/src/os_linux/reload.sh

-#! /bin/bash
+#!/bin/bash
 #
 # Proview   $Id: reload.sh,v 1.11 2008-04-10 10:38:30 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.

src/exp/com/src/os_linux/rt_print.sh

-#! /bin/bash
+#!/bin/bash
 #
 # Proview   $Id: rt_print.sh,v 1.2 2005-09-01 14:57:49 claes Exp $
 # Copyright (C) 2005 SSAB Oxelösund AB.

src/exp/com/src/os_linux/rt_webmon.sh

-#/bin/bash
+#!/bin/bash
 #
 # Proview   $Id: rt_webmon.sh,v 1.5 2007-10-30 07:48:50 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.

src/exp/com/src/os_linux/rt_webmonelog.sh

-#/bin/bash
+#!/bin/bash
 #
 # Proview   $Id: rt_webmonelog.sh,v 1.3 2007-10-30 07:48:50 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.

src/exp/com/src/os_linux/rt_webmonmh.sh

-#/bin/bash
+#!/bin/bash
 #
 # Proview   $Id: rt_webmonmh.sh,v 1.4 2007-10-30 07:48:50 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.

src/exp/com/src/os_linux/upgrade.sh

-#! /bin/bash
+#!/bin/bash
 #
 # Proview   $Id: upgrade.sh,v 1.17 2008-11-10 08:00:40 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.

src/exp/com/src/os_linux/upgrade_cnvdmp.sh

-#! /bin/bash
+#!/bin/bash
 #
 # Proview   $Id: upgrade_cnvdmp.sh,v 1.4 2006-01-30 09:02:51 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.

src/exp/com/src/os_linux/wb_rtt_comppicture.sh

-#! /bin/bash
+#!/bin/bash
 #
 # Proview   $Id: wb_rtt_comppicture.sh,v 1.2 2005-09-01 14:57:49 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.

src/tools/pkg/deb/op/.rtt_start

-#!/bin/sh
+#!/bin/bash
 ource /etc/pwrp_profile
 $pwr_exe/rt_rtt

src/tools/pkg/deb/op/.xtt_start

-#!/bin/sh
+#!/bin/bash
 source /etc/pwrp_profile
 $pwr_exe/rt_xtt -u $USER -a &

src/tools/pkg/deb/user/.rtt_start

-#!/bin/sh
+#!/bin/bash
 ource /etc/pwrp_profile
 $pwr_exe/rt_rtt

src/tools/pkg/deb/user/.xtt_start

-#!/bin/sh
+#!/bin/bash
 source /etc/pwrp_profile
 $pwr_exe/rt_xtt &

src/tools/pkg/ubu/op/.rtt_start

-#!/bin/sh
+#!/bin/bash
 ource /etc/pwrp_profile
 $pwr_exe/rt_rtt

src/tools/pkg/ubu/op/.xtt_start

-#!/bin/sh
+#!/bin/bash
 source /etc/pwrp_profile
 $pwr_exe/rt_xtt -u $USER -a &

src/tools/pkg/ubu/pwr/build.sh

@@ -176,7 +176,7 @@ cp $pwre_sroot/tools/pkg/deb/user/wtt_init1.pwr_com $pkgroot/usr/pwr$ver/$pwre_t
   echo "Name=Proview"
   echo "Type=Application"
   echo "Comment=Start Proview"
-  echo "Exec=xterm -title \"Proview Development Console\" -e 'export pwra_db=$aroot/db;source \$pwra_db/pwra_env.sh set base V""${version:0:3}"";wb -p pwrp pwrp'"
+  echo "Exec=xterm -title \"Proview Development Console\" -e 'export pwra_db=$aroot/db;source \$pwra_db/pwra_env.sh set base V""${version:0:3}"";source \$pwra_db/pwra_env.sh set bus;wb -p pwrp pwrp'"
   echo "Icon=$aroot/db/proview_icon.png"
   echo "Categories=GNOME;GTK;Application;"
 } > $pkgroot/usr/pwr$ver/$pwre_target/exp/cnf/user/proview.desktop

src/tools/pkg/ubu/pwr/postinst

@@ -49,6 +49,8 @@ if [ ! -e /home/pwrp/Desktop ]; then
   mkdir /home/pwrp/Desktop
 fi
 cp /usr/pwr$ver/$pwre_target/exp/cnf/user/proview.desktop /home/pwrp/Desktop
+chown pwrp:pwrp /home/pwrp/Desktop/proview.desktop
+chmod a+x /home/pwrp/Desktop/proview.desktop
 
 
 echo "Change owner of files to pwrp"

src/tools/pkg/ubu/user/.rtt_start

-#!/bin/sh
+#!/bin/bash
 ource /etc/pwrp_profile
 $pwr_exe/rt_rtt

src/tools/pkg/ubu/user/.xtt_start

-#!/bin/sh
+#!/bin/bash
 source /etc/pwrp_profile
 $pwr_exe/rt_xtt &

wb/exp/com/src/os_linux/wb_create_db.sh

+#!/bin/bash
 #
 # Proview   $Id: wb_create_db.sh,v 1.1 2006-01-23 08:44:30 claes Exp $
 # Copyright (C) 2005 SSAB Oxelösund AB.

wb/exp/com/src/os_linux/wb_gcg.sh

-#! /bin/bash
+#!/bin/bash
 #
 # Proview   $Id: wb_gcg.sh,v 1.7 2008-06-02 14:58:42 claes Exp $
 # Copyright (C) 2005 SSAB Oxelsund AB.

wb/exp/com/src/os_linux/wb_gre_print.sh

-#! /bin/bash
+#!/bin/bash
 #
 # Proview   $Id: wb_gre_print.sh,v 1.1 2006-01-23 08:44:30 claes Exp $
 # Copyright (C) 2005 SSAB Oxelösund AB.

wb/exp/com/src/os_linux/wb_open_db.sh

+#!/bin/bash
 #
 # Proview   $Id: wb_open_db.sh,v 1.3 2008-10-09 08:31:42 claes Exp $
 # Copyright (C) 2005 SSAB Oxelösund AB.

wb/exp/com/src/os_linux/wb_start.sh

+#!/bin/bash
 #
 # Proview   $Id: wb_start.sh,v 1.2 2007-05-28 14:50:48 claes Exp $
 # Copyright (C) 2005 SSAB Oxelösund AB.