Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Jaka Kranjc (53e457eb793e9c102d3c8e27e0aa091843e60d30)

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 quill by Jaka Kranjc (53e457eb793e9c102d3c8e27e0aa091843e60d30)
  • Date: Sat, 5 Aug 2006 16:38:40 -0500

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

usr/bin/quill | 3 +--
var/lib/quill/ChangeLog | 3 +++
var/lib/quill/modules/libcore | 2 +-
var/lib/quill/modules/libdetails | 17 +++++++++--------
4 files changed, 14 insertions(+), 11 deletions(-)

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

quill: together with ruskie fixed the prompt heisenberg
libdetails: fix redundant coloring, simplify query
libcore: fix globbing in quill_edit, wanted to edit .

diff --git a/usr/bin/quill b/usr/bin/quill
index aab0069..240949c 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -8,7 +8,6 @@ ##
## @ToDo Add option to use upstream gpg signature as included or
## @ToDo downloadable .sig file
## @ToDo Put a multiversion option
-## @ToDo Make an option to edit all the existing files after generation
## @ToDo single line or multiline depending on the length of line if
## @ToDo <80 single else multi
## @ToDo Interface to add CONFIGURE options
@@ -88,7 +87,7 @@ QUILL_SPELL_DIR=~/.sourcemage/spells
QUILL_TMP_DIR=~/.sourcemage/tmp

quill_rc
-PROMPT_DELAY="4294967295"
+PROMPT_DELAY="31557807"
BUILD_API=2
load_build_api
mkdir -p $QUILL_TMP_DIR
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 4745f1a..059513c 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,5 +1,8 @@
2006-08-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* quill: split the sourcing, so parameter parsing occurs earlier
+ together with ruskie fixed the prompt heisenberg
+ * libdetails: fix redundant coloring, simplify query
+ * libcore: fix globbing in quill_edit, wanted to edit .

2006-08-05 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* libcore: modified the message, added back the need for space
delimited
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 5b6afb1..89b8b18 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -92,7 +92,7 @@ #---
function quill_edit() {
message "Now invoking ${EDITOR:-nano} to edit spell files."
cd ${QUILL_SPELL_DIR}/${SPELL_NAME}
- for SPELL_FILE in .
+ for SPELL_FILE in *
do
${EDITOR:-nano} ${SPELL_FILE}
done
diff --git a/var/lib/quill/modules/libdetails
b/var/lib/quill/modules/libdetails
index f1b3fc9..0eaed63 100644
--- a/var/lib/quill/modules/libdetails
+++ b/var/lib/quill/modules/libdetails
@@ -60,21 +60,22 @@ fi
function query_spell_short_description(){
if ! [[ $SPELL_SHORT_DESCRIPTION ]] ||
! ( message "${QUERY_COLOR}Is${DEFAULT_COLOR}\n$SPELL_SHORT_DESCRIPTION"
- query "the proper short description?${DEFAULT_COLOR}" y ; ) ; then
+ query "the proper short description?" y ; ) ; then
message "${QUERY_COLOR}Please enter a short description of the
spell:${DEFAULT_COLOR}"
read "SPELL_SHORT_DESCRIPTION"
fi
}

function query_spell_description(){
-if ! test -f ${QUILL_TMP_DIR}/${SPELL_DESC_NAME:-${SPELL_NAME}} ||
+local description=${QUILL_TMP_DIR}/${SPELL_DESC_NAME:-${SPELL_NAME}}
+if ! test -f $description ||
! ( message "${QUERY_COLOR}Is${DEFAULT_COLOR}"
- cat ${QUILL_TMP_DIR}/${SPELL_DESC_NAME:-${SPELL_NAME}}
- query "the proper long description?${DEFAULT_COLOR}" y ; ) ; then
- message "${QUERY_COLOR}Please enter a description of the
spell:${DEFAULT_COLOR}"
- message "${PROBLEM_COLOR}!!!PRESS ENTER TO CONTINUE!!!${DEFAULT_COLOR}"
- read
- ${EDITOR:-nano} ${QUILL_TMP_DIR}/${SPELL_DESC_NAME:-${SPELL_NAME}}
+ cat $description
+ query "the proper long description?" y ; ) ; then
+ test -s $description ||
+ echo "Please enter a description of the spell here" > $description
+
+ ${EDITOR:-nano} $description
fi
}





Archive powered by MHonArc 2.6.24.

Top of Page