Source Mage code commit list

["Peng Chang (Charles)" <scm AT sourcemage.org>]

GIT changes to master grimoire by Peng Chang (Charles) <chp AT sourcemage.org>:

 windowmanagers/xmonad/HISTORY        |    4 ++++
 windowmanagers/xmonad/POST_RESURRECT |    4 +++-
 windowmanagers/xmonad/PRE_RESURRECT  |    4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit dd0dbfad238389bd5bbb2849b7bef7e68b751302
Author: Peng Chang (Charles) <chp AT sourcemage.org>
Commit: Peng Chang (Charles) <chp AT sourcemage.org>

    xmonad: PRE_RESURRECT, POST_RESURRECT: check before backup

diff --git a/windowmanagers/xmonad/HISTORY b/windowmanagers/xmonad/HISTORY
index 00a1ff9..151d4eb 100644
--- a/windowmanagers/xmonad/HISTORY
+++ b/windowmanagers/xmonad/HISTORY
@@ -1,3 +1,7 @@
+2009-07-26 Peng Chang (Charles) <chp AT sourcemage.org>
+       * PRE_RESURRECT, POST_RESURRECT: check whether
+         package.conf.old exists before backing up
+
 2009-04-22 Arjan Bouter <abouter AT sourcemage.org>
        * DETAILS: version 0.8.1
 
diff --git a/windowmanagers/xmonad/POST_RESURRECT 
b/windowmanagers/xmonad/POST_RESURRECT
index 63946c7..b057515 100755
--- a/windowmanagers/xmonad/POST_RESURRECT
+++ b/windowmanagers/xmonad/POST_RESURRECT
@@ -5,7 +5,9 @@ message "${MESSAGE_COLOR}Restoring package.conf and 
package.conf.old...${DEFAULT
 GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
 GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
 mv -v ${GHC_DIR}/package.conf.bak ${GHC_DIR}/package.conf
-mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
+if [ -f ${GHC_DIR}/package.conf.old.bak ] ; then
+  mv -v ${GHC_DIR}/package.conf.old.bak ${GHC_DIR}/package.conf.old
+fi
 
 message "${MESSAGE_COLOR}Registering package with ghc-pkg...${DEFAULT_COLOR}"
 CABAL_FILE=${INSTALL_ROOT}/usr/share/xmonad/xmonad.cabal
diff --git a/windowmanagers/xmonad/PRE_RESURRECT 
b/windowmanagers/xmonad/PRE_RESURRECT
index 96595c8..9ab1156 100755
--- a/windowmanagers/xmonad/PRE_RESURRECT
+++ b/windowmanagers/xmonad/PRE_RESURRECT
@@ -4,4 +4,6 @@ message "${MESSAGE_COLOR}Backuping package.conf and 
package.conf.old...${DEFAULT
 GHC_VERSION=$(ghc --version | tr -d ' ,[:alpha:]')
 GHC_DIR=${INSTALL_ROOT}/usr/lib/ghc-${GHC_VERSION}
 cp -v ${GHC_DIR}/package.conf ${GHC_DIR}/package.conf.bak
-cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
+if [ -f ${GHC_DIR}/package.conf.old ] ; then
+  cp -v ${GHC_DIR}/package.conf.old ${GHC_DIR}/package.conf.old.bak
+fi