From afb586885d4aa72a6069d093cda7518299282fe0 Mon Sep 17 00:00:00 2001
From: Daniel J Griffiths <griffithsdj@Archbox.localdomain>
Date: Sat, 23 Jan 2010 15:40:26 -0600
Subject: [PATCH] Update to 0.5 read CHANGELOG for details

---
 CHANGELOG        |  5 +++++
 install          |  2 +-
 src/cdm          |  2 +-
 src/cdmrc        | 21 ++++++++++++---------
 src/xinitrc.skel | 11 +++++++++++
 5 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 src/xinitrc.skel

diff --git a/CHANGELOG b/CHANGELOG
index 718923f..f127f6a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 0.5 (2010-01-23)
+	- Changed the way the xstart function works
+	- Hopefully stabilized the xinitrc support
+	- General cleanup
+
 Version 0.4.1 (2010-01-05)
 	- Fixed several stupid mistakes on my part
 
diff --git a/install b/install
index d2fafd6..42eb7a7 100755
--- a/install
+++ b/install
@@ -8,7 +8,7 @@ else
 	mkdir -p /usr/{bin,share/cdm}
 	install -m755 cdm /usr/bin/
 	install -Dm644 cdmrc /etc/cdmrc
-	install -m644 xinitrc /usr/share/cdm/
+	install -m644 xinitrc* /usr/share/cdm/
 	install -Dm755 zzz-cdm-profile.sh /etc/profile.d/zzz-cdm-profile.sh
 	cp -Rf themes /usr/share/cdm/
 fi
diff --git a/src/cdm b/src/cdm
index 83b6019..9ec4823 100755
--- a/src/cdm
+++ b/src/cdm
@@ -26,7 +26,7 @@
 #       MA 02110-1301, USA.
 
 name="Console Display Manager"
-ver="0.4.1"
+ver="0.5"
 info="\e[1;34m==>\e[1;37m"
 error="\e[1;31m==>\e[1;37m"
 success="\e[1;32m==>\e[1;37m"
diff --git a/src/cdmrc b/src/cdmrc
index 26c11d0..5d8f24a 100644
--- a/src/cdmrc
+++ b/src/cdmrc
@@ -7,10 +7,13 @@ theme=cdm
 countfrom=1
 
 # List all WM binary names
-wmbinlist=(awesome)
+wmbinlist=(awesome openbox-session)
 
 # List all WM display names
-wmdisplist=(Awesome)
+wmdisplist=(Awesome Openbox)
+
+# List programs to start at runtime
+runtime=('numlockx')
 
 # Allow console login?
 allowconsole=yes
@@ -77,13 +80,13 @@ locktty=no
 # /dev/null, so you won't see the complaints.
 loginshell=no
 
-# When usexinit=yes, we use ~/.xinitrc when it exists or
-# /etc/X11/xinit/xinitrc when it doesn't. These are passed the
-# chosen window manager as $1; note that the stock xinitrc
-# ignores this and always starts twm and three xterms. Your
-# custom xinitrc should start the window manager supplied as
-# $1 instead. If usexinit=no, then we instead call the chosen
-# window manager directly.
+# Additional arguments to pass to X server
+# When usexinit=yes, we use ~/.xinitrc when it exists or /etc/X11/xinit/xinitrc
+# when it doesn't. These are passed the chosen window manager as $1; note that
+# the stock /etc/X11/xinit/xinitrc ignores this and always starts twm and three
+# xterms. Your custom xinitrc should start the window manager supplied as $1
+# instead. There is a sample xinitrc included at /usr/share/cdm/xinitrc.skel.
+# If usexinit=no, then we instead call the chosen window manager directly.
 usexinit=no
 
 # Additional arguments to pass to X server; it will be called as:
diff --git a/src/xinitrc.skel b/src/xinitrc.skel
new file mode 100644
index 0000000..48abd42
--- /dev/null
+++ b/src/xinitrc.skel
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+###########################
+
+# Custom xinitrc goes here
+
+###########################
+
+
+wm_bin="$1"
+exec ${wm_bin}