sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Puppet_Master (bdd5e1fe13b50ce945158fcaed52a63ee6426f73)

From: Puppet_Master <scm AT sourcemage.org>
To: sm-commit AT lists.ibiblio.org
Subject: [SM-Commit] GIT changes to master grimoire by Puppet_Master (bdd5e1fe13b50ce945158fcaed52a63ee6426f73)
Date: Tue, 26 Jun 2007 16:07:53 -0500

GIT changes to master grimoire by Puppet_Master <puppetmaster.e17 AT gmail.com>:

audio-players/mpd/FINAL | 17 ++++++++---------
audio-players/mpd/HISTORY | 6 +++++-
audio-players/mpd/INSTALL | 8 ++++++--
3 files changed, 19 insertions(+), 12 deletions(-)

New commits:
commit bdd5e1fe13b50ce945158fcaed52a63ee6426f73
Author: Philippe Caseiro <puppet_master AT else-projects.org>
Commit: Puppet_Master <puppetmaster.e17 AT gmail.com>

Cleaning mpd spell
FINAL : Using local vars
INSTALL : Fixing installation of config file

diff --git a/audio-players/mpd/FINAL b/audio-players/mpd/FINAL
index b38d3a5..0ba4967 100755
--- a/audio-players/mpd/FINAL
+++ b/audio-players/mpd/FINAL
@@ -1,23 +1,22 @@
# If the user chose to install init script
# we do what mpd need to run as a service correctly
if [[ $INIT_INSTALLED ]]; then
- source ${GRIMOIRE}/libaccount &&
- I_R=${INSTALL_ROOT} &&
- MPD_LIB="${I_R}/var/lib/mpd" &&
- MPD_DIRS="${MPD_LIB}/music ${MPD_LIB}/playlists" &&
- MPD_FILES="${I_R}/var/log/mpd.log ${I_R}/var/log/mpd.error" &&
- create_account musicdaemon &&
+ source ${GRIMOIRE}/libaccount
&&
+ local MPD_LIB="${INSTALL_ROOT}/var/lib/mpd"
&&
+ local MPD_DIRS="${MPD_LIB}/music ${MPD_LIB}/playlists"
&&
+ local MPD_FILES="${INSTALL_ROOT}/var/log/mpd.log
${INSTALL_ROOT}/var/log/mpd.error" &&
+ create_account musicdaemon
&&
for dir in "${MPD_LIB} ${MPD_DIRS}";
do
if [[ ! -r ${dir} ]]; then
- mkdir -p ${dir} &&
+ mkdir -p ${dir}
&&
chown musicdaemon:audio ${dir}
fi
- done &&
+ done
&&
for file in ${MPD_FILES};
do
if [[ ! -r ${file} ]]; then
- touch ${file} &&
+ touch ${file}
&&
chown musicdaemon:audio ${file}
fi
done
diff --git a/audio-players/mpd/HISTORY b/audio-players/mpd/HISTORY
index b75f4a7..4a5368a 100644
--- a/audio-players/mpd/HISTORY
+++ b/audio-players/mpd/HISTORY
@@ -1,4 +1,8 @@
-2007-06-22 Philippe "Puppet_Master" Caseiro <caseiro.philippe AT free.fr>
+2007-06-26 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * FINAL : using local vars
+ * INSTALL : fixing installation of config file (SM-COMMIT thread)
+
+2007-06-22 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
* FINAL : Changing MPD_HOME to MPD_LIB
* init.d/mpd : Removing bad comment

diff --git a/audio-players/mpd/INSTALL b/audio-players/mpd/INSTALL
index a4f04a6..79c56d7 100755
--- a/audio-players/mpd/INSTALL
+++ b/audio-players/mpd/INSTALL
@@ -1,3 +1,7 @@
default_install &&
-install_config_file doc/mpdconf.example \
- $INSTALL_ROOT/etc/mpd.conf
+if [[ $INIT_INSTALLED ]]; then
+ cp ${SPELL_DIRECTORY}/mpd.conf ${INSTALL_ROOT}/etc
+else
+ install_config_file doc/mpdconf.example \
+ $INSTALL_ROOT/etc/mpd.conf
+fi

[SM-Commit] GIT changes to master grimoire by Puppet_Master (bdd5e1fe13b50ce945158fcaed52a63ee6426f73), Puppet_Master, 06/26/2007