Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b3b389c09b79115c28634a27147b83da8a45d15e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b3b389c09b79115c28634a27147b83da8a45d15e)
  • Date: Sun, 25 Feb 2007 03:09:38 -0600

GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:

kde-core/kdebase/BUILD | 4 ++--
kde-core/kdebase/HISTORY | 3 +++
kde-core/kdebase/INSTALL | 14 +++++++-------
3 files changed, 12 insertions(+), 9 deletions(-)

New commits:
commit b3b389c09b79115c28634a27147b83da8a45d15e
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

kdebase: fix config saving hack, TMP_DIR is different in BUILD and
INSTALL in

devel sorcery, since it calls delve, which makes its own

diff --git a/kde-core/kdebase/BUILD b/kde-core/kdebase/BUILD
index 19df345..1273478 100755
--- a/kde-core/kdebase/BUILD
+++ b/kde-core/kdebase/BUILD
@@ -18,10 +18,10 @@ 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 $TMP_DIR/kdm &&
+ mkdir -p kdm-3.141594 &&
echo "Backing up configuration files..." &&
mv $INSTALL_ROOT/usr/share/config/kdm/{background,kdm}rc \
- $TMP_DIR/kdm &&
+ kdm-3.141594 &&
rm -rf $INSTALL_ROOT/usr/share/config/kdm
fi
fi
diff --git a/kde-core/kdebase/HISTORY b/kde-core/kdebase/HISTORY
index aceab6b..7b24b09 100644
--- a/kde-core/kdebase/HISTORY
+++ b/kde-core/kdebase/HISTORY
@@ -1,3 +1,6 @@
+2007-02-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * BUILD, INSTALL: use the source dir for configuration backup
+
2007-02-02 Juuso Alasuutari <iuso AT sourcemage.org>
* PRE_SUB_DEPENDS, SUB_DEPENDS: Added, sub-dependency for
cyrus-sasl (bug #13483).
diff --git a/kde-core/kdebase/INSTALL b/kde-core/kdebase/INSTALL
index b065db8..20d3e00 100755
--- a/kde-core/kdebase/INSTALL
+++ b/kde-core/kdebase/INSTALL
@@ -1,13 +1,13 @@
default_install &&
-if [ -d "$TMP_DIR/kdm" ]; then
+if [[ -d kdm-3.141594 ]]; then
# Restore backuped kdm dir
echo "Restoring configuration files..."
&&
- mv $INSTALL_ROOT/usr/share/config/kdm/backgroundrc
$TMP_DIR/kdm/backgroundrc.new &&
- mv $INSTALL_ROOT/usr/share/config/kdm/kdmrc $TMP_DIR/kdm/kdmrc.new &&
- mv $TMP_DIR/kdm/{background,kdm}rc $INSTALL_ROOT/usr/share/config/kdm/ &&
- install_config_file $TMP_DIR/kdm/backgroundrc.new
$INSTALL_ROOT/usr/share/config/kdm/backgroundrc &&
- install_config_file $TMP_DIR/kdm/kdmrc.new
$INSTALL_ROOT/usr/share/config/kdm/kdmrc &&
- rm -r $TMP_DIR/kdm
+ mv $INSTALL_ROOT/usr/share/config/kdm/backgroundrc
kdm-3.141594/backgroundrc.new &&
+ mv $INSTALL_ROOT/usr/share/config/kdm/kdmrc kdm-3.141594/kdmrc.new &&
+ mv kdm-3.141594/{background,kdm}rc $INSTALL_ROOT/usr/share/config/kdm/ &&
+ install_config_file kdm-3.141594/backgroundrc.new
$INSTALL_ROOT/usr/share/config/kdm/backgroundrc &&
+ install_config_file kdm-3.141594/kdmrc.new
$INSTALL_ROOT/usr/share/config/kdm/kdmrc &&
+ rm -r kdm-3.141594
fi &&
if [[ $SMGL_THEME == "y" ]]; then
if [[ ! -e $INSTALL_ROOT/usr/share/apps/ksplash/Themes/SourceMage ]]; then



  • [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (b3b389c09b79115c28634a27147b83da8a45d15e), Jaka Kranjc, 02/25/2007

Archive powered by MHonArc 2.6.24.

Top of Page