summaryrefslogtreecommitdiffstats
path: root/abs/core/LinHES-system/LinHES-session
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-08-22 22:25:41 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-08-22 22:25:41 (GMT)
commitd7fd6a71150dca90db5962f56132499b77b6a686 (patch)
tree18eb93fd5c7c64888a4a6102a50ef3d9f5eae1fc /abs/core/LinHES-system/LinHES-session
parentbc379762ab427518b88dc7be75720a6c62e05513 (diff)
downloadlinhes_pkgbuild-d7fd6a71150dca90db5962f56132499b77b6a686.zip
linhes_pkgbuild-d7fd6a71150dca90db5962f56132499b77b6a686.tar.gz
linhes_pkgbuild-d7fd6a71150dca90db5962f56132499b77b6a686.tar.bz2
LinHES-system: add ability to run files from /etc/X11/autostart when the frontend is started.
minor fix with determining the window manager
Diffstat (limited to 'abs/core/LinHES-system/LinHES-session')
-rwxr-xr-xabs/core/LinHES-system/LinHES-session19
1 files changed, 15 insertions, 4 deletions
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session
index 8e5d72b..0436898 100755
--- a/abs/core/LinHES-system/LinHES-session
+++ b/abs/core/LinHES-system/LinHES-session
@@ -180,7 +180,6 @@ function show_help_tip(){
}
function notify_scan(){
- delay_osd
if [ -e /tmp/scan_report ]
then
msg "\nNew storage found. \nRun add_storage.py for details"
@@ -188,6 +187,17 @@ function notify_scan(){
}
+function auto_start(){
+ asdir="/etc/X11/autostart"
+ for i in `ls $asdir/*`
+ do
+ if [ -x $i ]
+ then
+ echo "Starting $i"
+ $i &
+ fi
+ done
+ }
function update_apple_trailers(){
#update apple trailers
@@ -335,10 +345,10 @@ function set_background()
{
echo "Setting the background"
- }
+}
-if [ x$WM = "x" ]
+if [ x"$WM" = "x" ]
then
# fluxbox > /var/log/fluxbox.log 2>&1
WM=fluxbox
@@ -350,12 +360,13 @@ $WM &
pid=$!
mouse_move
keylaunch
-set_background
+#set_background
unclutter
load_nvidia_settings
run_tilda
start_screensaver
notify_scan &
+auto_start &
update_apple_trailers
first_configure
show_help_tip