[SM-Commit] GIT changes to master grimoire by Eric Sandall (8f1590d091d3a5eeb038d1d738bb8a580008dc5e)

Eric Sandall scm at sourcemage.org
Thu Oct 16 02:39:41 EDT 2008


GIT changes to master grimoire by Eric Sandall <sandalle at sourcemage.org>:

 kde-core/kdebase/BUILD   |   14 ++++++++------
 kde-core/kdebase/HISTORY |    4 ++++
 2 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 8f1590d091d3a5eeb038d1d738bb8a580008dc5e
Author: Eric Sandall <sandalle at sourcemage.org>
Commit: Eric Sandall <sandalle at sourcemage.org>

    kdebase: Only backup files if they exist

diff --git a/kde-core/kdebase/BUILD b/kde-core/kdebase/BUILD
index 1273478..59afe68 100755
--- a/kde-core/kdebase/BUILD
+++ b/kde-core/kdebase/BUILD
@@ -16,12 +16,14 @@ OPTS="$OPTS  $KDEBASE_XCONSOLE  $KDEBASE_DPMS  $KDEBASE_XDMCP"  &&
 # Backup existing kdm dir
 if spell_ok $SPELL; then
   OLD_VERSION=$(installed_version $SPELL)                       &&
-  if [[ ${VERSION:0:3} == ${OLD_VERSION:0:3} ]]     &&
-     [[ -d "$INSTALL_ROOT/usr/share/config/kdm" ]]; then
-    mkdir -p kdm-3.141594                                       &&
-    echo "Backing up configuration files..."                    &&
-    mv $INSTALL_ROOT/usr/share/config/kdm/{background,kdm}rc    \
-                                                kdm-3.141594    &&
+  if [[ ${VERSION:0:3} == ${OLD_VERSION:0:3} ]]; then
+    for backupfile in $INSTALL_ROOT/usr/share/config/kdm/{background,kdm}rc; do
+      if [[ -f $backupfile ]]; then
+        echo "Backing up configuration file $backupfile..."  &&
+        mkdir -p kdm-3.141594                                &&
+        mv $backupfile kdm-3.141594
+      fi
+    done
     rm -rf $INSTALL_ROOT/usr/share/config/kdm
   fi
 fi
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index 5bd419b..c86748e 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,7 @@
+2008-10-15 Eric Sandall <sandalle at sourcemage.org>
+	* BUILD: Only backup the files if they exist, not just
+	  if there's a directory
+
 2008-09-24 Andrew Stitt <astitt at sourcemage.org>
 	* DEPENDS: add missing dependencies
 



More information about the SM-Commit mailing list