Update of /cvsroot/lastbash/lastbash
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv1252
Modified Files:
lastbash
Log Message:
Use distro config file.
Index: lastbash
===================================================================
RCS file: /cvsroot/lastbash/lastbash/lastbash,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- lastbash 11 Dec 2006 22:57:18 -0000 1.99
+++ lastbash 12 Dec 2006 12:03:31 -0000 1.100
@@ -51,6 +51,7 @@
# Files and directories
HOME_DIR="${HOME}/.lastbash"
+DIST_CONF_FILE="/etc/lastbash.config"
CONF_FILE="${HOME_DIR}/config"
AUTH_FILE="${HOME_DIR}/auth"
PLAYER_PIPE="${HOME_DIR}/player_fifo"
@@ -88,7 +89,8 @@
#-----------------------------------------------------------------------------
# Create the home directory if missing
[ ! -d "${HOME_DIR}" ] && mkdir -p "${HOME_DIR}"
-# Load the user settings if they exist
+# Load the settings if they exist
+[ -f "${DIST_CONF_FILE}" ] && source "${DIST_CONF_FILE}"
[ -f "${CONF_FILE}" ] && source "${CONF_FILE}"
# Load the authentication settings if they exist
[ -f "${AUTH_FILE}" ] && source "${AUTH_FILE}"
|
