Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (50c3b486c667c05c321cd085e9824e9c4f39a25a)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (50c3b486c667c05c321cd085e9824e9c4f39a25a)
  • Date: Sat, 22 Oct 2011 06:13:26 -0500

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

ChangeLog | 10 ++++++++++
etc/sorcery/hooks/xterm_title.hook | 17 -----------------
usr/sbin/alter | 2 +-
usr/sbin/vcast | 2 --
var/lib/sorcery/modules/libmisc | 17 +++++++++++++++++
var/lib/sorcery/modules/libresurrect | 2 +-
var/lib/sorcery/modules/libsummon | 3 +++
7 files changed, 32 insertions(+), 21 deletions(-)

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

alter, vcast: removed last mentions of cast --fix (deprecated long time
ago)

commit c9c5fcba958877b867e0fffed3d1e0b2a38bcfeb
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libressurect: clarified a merge message
based on c664ae494729b8

commit 0c004cbb265fc34b8f884714acec26af727f0df6
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libsummon: added msg with information that file was downloaded

Conflicts:

ChangeLog

commit a65603eae5f4d111aa201894790b10fd60bf9b12
Author: Bor Kraljič <pyrobor AT ver.si>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

xterm_title.hook,libmisc: moved function set_term_title to libmisc

Some scripts in guru-tools (example hashcheck.sh) use set_term_title.
To be able to use it without init hooks function must be in libmisc.

Such function can be very usefull when coding with sorcery functions so
lets have it in libmisc.

Signed-off-by: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

diff --git a/ChangeLog b/ChangeLog
index 2460a75..5c0b7e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2011-10-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libressurect: clarified a merge message
+ * alter, vcast: removed last mentions of cast --fix
+
+2011-10-21 Bor Kraljič <pyrobor AT ver.si>
+ * libsummon: added msg with information that file was downloaded
+
+2011-10-21 Bor Kraljič <pyrobor AT ver.si>
+ * xterm_title.hook,libmisc: moved function set_term_title to libmisc
+
2011-10-21 Bor Kraljič <pyrobor AT ver.si>
* cleanse, confmeld, scribbler, scribe, sorcery: added missing
init_hooks,
fixes #298
diff --git a/etc/sorcery/hooks/xterm_title.hook
b/etc/sorcery/hooks/xterm_title.hook
index 45ea5bc..1713b6c 100755
--- a/etc/sorcery/hooks/xterm_title.hook
+++ b/etc/sorcery/hooks/xterm_title.hook
@@ -6,23 +6,6 @@

[[ $SET_TERM_TITLE != "on" ]] && return 0

-#---------------------------------------------------------------------
-## @param title
-## @Globals TERM
-##
-## sets the terminal title if TERM=xterm|rxvt or the window title if
-## TERM=screen
-##
-#---------------------------------------------------------------------
-function set_term_title()
-{
- case $TERM in
- xterm*|rxvt) echo -ne "\e]0;$@\007" ;;
- screen) echo -ne "\ek$@\e\\" ;;
- *) true ;;
- esac
-}
-
function xterm_title_cast_initialize_hook() {
set_term_title "cast started"
}
diff --git a/usr/sbin/alter b/usr/sbin/alter
index 43aec5f..e356b17 100755
--- a/usr/sbin/alter
+++ b/usr/sbin/alter
@@ -410,7 +410,7 @@ but keep them in the analyzed spell. For example, if you
run it on
coreutils, psmisc and util-linux will have their /bin/kill purged from
their md5sum records. This however leaves them in the install logs of
the environmental spells because they actually were installed by the
-spell. The purpose is to enable a more intelligent cast --fix. a
+spell. The purpose is to enable a more intelligent cleanse --fix. a
forced dispel -d env_spell env_version will restore the environmental
md5log and restore the binary from the environmental spell, so this is
undoable piecemeal, or, you can use the shotgun undo cache created,
diff --git a/usr/sbin/vcast b/usr/sbin/vcast
index 6fdd6d1..5b301e8 100755
--- a/usr/sbin/vcast
+++ b/usr/sbin/vcast
@@ -30,10 +30,8 @@ process_parameters() {
case $1 in

--from) export SOURCE_CACHE="$2"; shift 2 ;;
- -n|--nofix) NO_SUMMON="$1"; NO_GAZE="$1"; shift 1 ;;
--silent) NO_SUMMON="$1"; NO_GAZE="$1"; shift 1 ;;
--deps) NO_SUMMON="$1"; shift 1 ;;
- -f|--fix) NO_SUMMON="$1"; shift 1 ;;
--help) HELP="$1"; shift 1 ;;
-s) NO_SUMMON="$1"; shift 1 ;;
*) shift 1 ;;
diff --git a/var/lib/sorcery/modules/libmisc b/var/lib/sorcery/modules/libmisc
index 8e4635f..80172a7 100755
--- a/var/lib/sorcery/modules/libmisc
+++ b/var/lib/sorcery/modules/libmisc
@@ -1748,6 +1748,23 @@ function show_file() {
fi
}

+#---------------------------------------------------------------------
+## @param title
+## @Globals TERM
+##
+## sets the terminal title if TERM=xterm|rxvt or the window title if
+## TERM=screen
+##
+#---------------------------------------------------------------------
+function set_term_title()
+{
+ case $TERM in
+ xterm*|rxvt) echo -ne "\e]0;$@\007" ;;
+ screen) echo -ne "\ek$@\e\\" ;;
+ *) true ;;
+ esac
+}
+
# Standard debug line:
# file "function@line" "all" "args"
STD_DEBUG='eval local _stddbg_file=${BASH_SOURCE[0]} ;
diff --git a/var/lib/sorcery/modules/libresurrect
b/var/lib/sorcery/modules/libresurrect
index 21090c1..4065dff 100755
--- a/var/lib/sorcery/modules/libresurrect
+++ b/var/lib/sorcery/modules/libresurrect
@@ -536,7 +536,7 @@ function real_handle_changed_config() {
message "(0) trash $to and install over it"
message "(1) backup $to to $to.$savetime.old, install the new file in
its place"
message "(2) leave $to in its place, copy the new file to
$to.$savetime.new"
- message "(3) do nothing"
+ message "(3) do nothing - leave $to in its place, discard new file"
message "(4) see a diff between $to and the new file"
# TODO: someday add an option to use an external merge tool

diff --git a/var/lib/sorcery/modules/libsummon
b/var/lib/sorcery/modules/libsummon
index 3de9d2b..5e1cc24 100755
--- a/var/lib/sorcery/modules/libsummon
+++ b/var/lib/sorcery/modules/libsummon
@@ -259,6 +259,9 @@ function download_src_args() {
"${DEFAULT_COLOR}"
return 1
fi
+ message "${MESSAGE_COLOR}Downloaded source file" \
+ "${FILE_COLOR}${target}${DEFAULT_COLOR}"
+
rm -rf $SOURCE_CACHE/$target &&
mv $target $SOURCE_CACHE
}



  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (50c3b486c667c05c321cd085e9824e9c4f39a25a), Jaka Kranjc, 10/22/2011

Archive powered by MHonArc 2.6.24.

Top of Page