Skip to Content.
Sympa Menu

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

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 (ece1a176b0f95848ddbe643eae217ffcf92f5f7a)
  • Date: Tue, 9 Jan 2007 11:22:23 -0600

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

usr/bin/quill | 2 +-
var/lib/quill/ChangeLog | 7 +++++++
var/lib/quill/modules/libbuild | 3 +--
var/lib/quill/modules/libcore | 17 +++++++++++++----
var/lib/quill/version | 2 +-
5 files changed, 23 insertions(+), 8 deletions(-)

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

* libcore: fixed query_list header and usage; further improved dumping
added overwriting-of-exsisting-spell managment to final put
* quill: fix query_list usage
* libbuild: beautified and improved the default_build dump
* version: 0.1.10.2

diff --git a/usr/bin/quill b/usr/bin/quill
index 6f74066..cadb330 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -138,7 +138,7 @@ then
"Add a \$SCM version" \
"Try it out" \
"Quit" )
- query_list "What do you want to do?" ANSWER "${actions[@]}"
+ query_list "What do you want to do?" ANSWER ${actions[0]} "${actions[@]}"

[[ $ANSWER == "Quit" ]] && exit 0

diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 1696e7f..9846eeb 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcore: fixed query_list header and usage; further improved dumping
+ added overwriting-of-exsisting-spell managment to final put
+ * quill: fix query_list usage
+ * libbuild: beautified and improved the default_build dump
+ * version: 0.1.10.2
+
2006-01-08 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcore: added dump_default_function, since now the names are
different
in devel sorcery (was dumping "false")
diff --git a/var/lib/quill/modules/libbuild b/var/lib/quill/modules/libbuild
index d20816d..de623bf 100644
--- a/var/lib/quill/modules/libbuild
+++ b/var/lib/quill/modules/libbuild
@@ -20,8 +20,7 @@ function add_build() {
else
if query "Do you want the default_build function dumped into the BUILD
file" "n"
then
- dump_default_function build | sed 's:\(.\{20,41\}\)--:\1\\\n --:g' | \
- sed "s:&&:\&\&\n:g" >> BUILD
+ dump_default_function build | sed -e 's:\( --[^hb]\): \\\n \1:g' -e
"s:&& make:\&\&\nmake:" >> BUILD
else
echo "default_build &&" >> BUILD
fi
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index aee4aac..83faede 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -2,7 +2,8 @@
## @Synopsis query_list function from init-manager
## $1 - the question
## $2 - the VARIABLE to which to store the answer
-## $3...$n - the options for the list
+## $3 - the default answer
+## $4...$n - the options for the list
#---
function query_list()
{
@@ -155,7 +156,7 @@ function quill_set_executable_bit() {
function quill_final_put_in_grimoire() {

query_list "Into which grimoire do you wish to put the spell:"
QUILL_GRIM_NAME \
- $(codex_get_all_grimoires | get_basenames)
+ "" $(codex_get_all_grimoires | get_basenames)
echo
QUILL_GRIM_NAME=$(codex_canonicalize_grimoire_name $QUILL_GRIM_NAME)

@@ -164,6 +165,14 @@ function quill_final_put_in_grimoire() {
codex_get_section_names $QUILL_GRIM_NAME | column
query_string QUILL_SECT_NAME "Into which section do you wish to put the
spell: "

+ if [[ -e $QUILL_GRIM_NAME/$QUILL_SECT_NAME/$SPELL_NAME ]]; then
+ message "${MESSAGE_COLOR}There is an exsisting spell for $SPELL_NAME in
$QUILL_GRIM_NAME/$QUILL_SECT_NAME"
+ if ! query "Do you want to overwrite it?" y; then
+ quill_final_put_in_grimoire
+ return
+ fi
+ fi
+
message "Scribbling spell into
$QUILL_GRIM_NAME/$QUILL_SECT_NAME/$SPELL_NAME ..."

quill_final_put_in_grimoire_sub(){
@@ -197,7 +206,7 @@ function dump_default_function() {
if ! declare -f real_default_sorcery_$1; then
# old sorcery
declare -f real_default_$1
- fi | tail -n -2 | head -n 1
+ fi | sed -e '1,3 d' -e '$ d' -e 's, ,,'
}

#---
@@ -212,7 +221,7 @@ This is free software. You may redistri
the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
There is NO WARRANTY, to the extent permitted by law.

-Originaly written by:
+Originally written by:
Andra?? 'ruskie' Levstik
Rewritten by:
Andra?? 'ruskie' Levstik
diff --git a/var/lib/quill/version b/var/lib/quill/version
index c433041..160aada 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.1.10.1
+0.1.10.2



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (ece1a176b0f95848ddbe643eae217ffcf92f5f7a), Jaka Kranjc, 01/09/2007

Archive powered by MHonArc 2.6.24.

Top of Page