Skip to Content.
Sympa Menu

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

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 (702e174a44163bd32a887839968560672aba2784)
  • Date: Thu, 17 Apr 2008 05:39:52 -0500

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

ChangeLog | 2 ++
var/lib/sorcery/modules/libsorcery | 15 +++++++--------
2 files changed, 9 insertions(+), 8 deletions(-)

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

reformatted and sanitized list_install_queue

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

removed an extra space in list_install_queue

diff --git a/ChangeLog b/ChangeLog
index 31d247b..73cd6e9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
* libsorcery: made verbose queuing use the version cache too and now
all
the reasons are displayed, not just the first (only in the cache
code)
readded the progress bar, but only to the slow part of the queuing
+ removed an extra space in list_install_queue
+ reformatted and sanitized list_install_queue

2008-04-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* scribe.8: don't mention local grimoires for reindex-version,
nothing good
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 602a071..b57abe8 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -814,26 +814,25 @@ function optimize() {
##
#---------------------------------------------------------------------
function list_install_queue() {
- if [ -f $INSTALL_QUEUE ]; then
+ if [[ -f $INSTALL_QUEUE ]]; then
lock_file $INSTALL_QUEUE

echo
message -n "The following spells will be updated:"
message "${SPELL_COLOR}"
- cat $INSTALL_QUEUE | column
+ column $INSTALL_QUEUE
message "${DEFAULT_COLOR}"

- if query "Do you wish to edit ${FILE_COLOR} $INSTALL_QUEUE
${DEFAULT_COLOR}?" n
- then edit_file $INSTALL_QUEUE
- fi
+ query "Do you wish to edit$FILE_COLOR $INSTALL_QUEUE $DEFAULT_COLOR?" n
&&
+ edit_file $INSTALL_QUEUE

- if [ -n "`cat $INSTALL_QUEUE`" ]; then
- SPELLS=`cat $INSTALL_QUEUE`
+ if [[ -s $INSTALL_QUEUE ]]; then
+ SPELLS=$(< $INSTALL_QUEUE)
fi

unlock_file $INSTALL_QUEUE
else
- message "${MESSAGE_COLOR}No spells listed in queue.${DEFAULT_COLOR}"
+ message "${MESSAGE_COLOR}No spells listed in the queue.$DEFAULT_COLOR"
fi
}




  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (702e174a44163bd32a887839968560672aba2784), Jaka Kranjc, 04/17/2008

Archive powered by MHonArc 2.6.24.

Top of Page