sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (e32fcc51274eae58a8bdcb5ade30a7310b00e2e9)
- 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 (e32fcc51274eae58a8bdcb5ade30a7310b00e2e9)
- Date: Sat, 11 Nov 2006 12:51:13 -0600
GIT changes to master grimoire by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
shell-term-fm/screen/CONFIGURE | 10 ++++------
shell-term-fm/screen/HISTORY | 4 ++++
shell-term-fm/screen/INSTALL | 11 +++--------
3 files changed, 11 insertions(+), 14 deletions(-)
New commits:
commit e32fcc51274eae58a8bdcb5ade30a7310b00e2e9
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
screen: fix rest of #11635 - cleanup, sanity
diff --git a/shell-term-fm/screen/CONFIGURE b/shell-term-fm/screen/CONFIGURE
index f4618f8..ad3fbf0 100755
--- a/shell-term-fm/screen/CONFIGURE
+++ b/shell-term-fm/screen/CONFIGURE
@@ -1,8 +1,6 @@
-
-if ! grep -q "REPLACE_RC" $SPELL_CONFIG; then
- if query "Override your /etc/screenrc with new one ?" n
- then echo "REPLACE_RC=y" >> $SPELL_CONFIG
- else echo "REPLACE_RC=n" >> $SPELL_CONFIG
- fi
+if query "Install the Source Mage /etc/screenrc ?" n
+then
+ persistent_add SCREEN_RC
+ SCREEN_RC=yes
fi
diff --git a/shell-term-fm/screen/HISTORY b/shell-term-fm/screen/HISTORY
index 3aee756..80897d3 100644
--- a/shell-term-fm/screen/HISTORY
+++ b/shell-term-fm/screen/HISTORY
@@ -1,3 +1,7 @@
+2006-11-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: remove the bitrot and do the right thing
+ * INSTALL: accompanying changes, fixes rest of #11635
+
2006-10-30 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* DETAILS: update to 4.0.3 + SECURITY_PATCH=1,
http://secunia.com/advisories/22583/
diff --git a/shell-term-fm/screen/INSTALL b/shell-term-fm/screen/INSTALL
index a0255f0..2cafe3d 100755
--- a/shell-term-fm/screen/INSTALL
+++ b/shell-term-fm/screen/INSTALL
@@ -1,10 +1,5 @@
default_install &&
-if [ -f /etc/screenrc ]; then
- if [ "$REPLACE_RC" == "y" ]; then
- cp ${SCRIPT_DIRECTORY}/screenrc /etc/screenrc
- else
- cp ${SCRIPT_DIRECTORY}/screenrc /etc/screenrc.new
- fi
-else
- cp ${SCRIPT_DIRECTORY}/screenrc /etc/screenrc
+if [[ $SCREEN_RC == yes ]]; then
+ install_config_file $SCRIPT_DIRECTORY/screenrc /etc/screenrc &&
+ persistent_remove SCREEN_RC
fi
- [SM-Commit] GIT changes to master grimoire by Jaka Kranjc (e32fcc51274eae58a8bdcb5ade30a7310b00e2e9), Jaka Kranjc, 11/11/2006
Archive powered by MHonArc 2.6.24.