Skip to Content.
Sympa Menu

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

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 (691992c41b6955df2340cec95bbefb5a502ee75c)
  • Date: Mon, 8 Jan 2007 15:28:08 -0600

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

usr/bin/quill | 6 +++++-
var/lib/quill/ChangeLog | 9 +++++++++
var/lib/quill/modules/libbuild | 8 +++-----
var/lib/quill/modules/libcore | 12 ++++++++++++
var/lib/quill/modules/libinstall | 4 ++--
var/lib/quill/modules/libpre_build | 4 ++--
var/lib/quill/version | 2 +-
7 files changed, 34 insertions(+), 11 deletions(-)

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

fix default function dumping and simplify, fix #11884

diff --git a/usr/bin/quill b/usr/bin/quill
index 74512e5..6f74066 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -409,7 +409,11 @@ else
message "The spell has been generated and put into:
$QUILL_SPELL_DIR/$SPELL_NAME"
if query "Do you want to put the spell into one of the avialable
grimoires?" n
then
- quill_final_put_in_grimoire
+ quill_final_put_in_grimoire &&
+ if query "Do you want to *try* to cast the spell?" n
+ then
+ cast $SPELL_NAME
+ fi
fi
fi
message "That's all folks!"
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 663e617..1696e7f 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,12 @@
+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")
+ TODO: add overwriting-of-exsisting-spell prevention to final put
+ * libbuild, libpre_build, libinstall: made use of it
+ add missing && - if you're adding the file, you'll be adding custom
code
+ * quill: ask if the user is feeling lucky and wants to cast #11884
+ * version: 0.1.10.1
+
2006-12-29 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* quill: fixed SOURCE_GPG check, reenabled
quill_final_put_in_grimoire,
fixed fmxml mode by having it redo parse_spell_source_file_info
diff --git a/var/lib/quill/modules/libbuild b/var/lib/quill/modules/libbuild
index e3ffa25..d20816d 100644
--- a/var/lib/quill/modules/libbuild
+++ b/var/lib/quill/modules/libbuild
@@ -18,14 +18,12 @@ function add_build() {
if [[ "$QUILL_CPAN_MODE" == "on" ]]; then
cp ${QUILL_TMP_DIR}/${SPELL_NAME}-BUILD
${QUILL_SPELL_DIR}/${SPELL_NAME}/BUILD
else
- touch BUILD
if query "Do you want the default_build function dumped into the BUILD
file" "n"
then
- (declare -f real_default_build | \
- tail -n -2 | head -n 1 | sed 's:\(.\{20,41\}\)--:\1\\\n --:g' | \
- sed "s:&&:\&\&\n:g") >> BUILD
+ dump_default_function build | sed 's:\(.\{20,41\}\)--:\1\\\n --:g' | \
+ sed "s:&&:\&\&\n:g" >> BUILD
else
- echo "default_build" >> BUILD
+ echo "default_build &&" >> BUILD
fi
fi
$EDITOR BUILD
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index f61945e..aee4aac 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -171,6 +171,7 @@ function quill_final_put_in_grimoire() {
cp -r $QUILL_SPELL_DIR/$SPELL_NAME $QUILL_GRIM_NAME/$QUILL_SECT_NAME/
if [[ $? != 0 ]]; then
echo "Scribbling failed!"
+ return 1
else
echo "Scribbling succeded"
echo
@@ -189,6 +190,17 @@ function quill_final_put_in_grimoire() {
}

#---
+## @Synopsis dumps the default spell file function, taking into
+## account that devel has a new spell file inheritance scheme
+#---
+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
+}
+
+#---
## @Synopsis function that displays the version and exits
#---
function quill_version() {
diff --git a/var/lib/quill/modules/libinstall
b/var/lib/quill/modules/libinstall
index 652799a..c463450 100644
--- a/var/lib/quill/modules/libinstall
+++ b/var/lib/quill/modules/libinstall
@@ -9,9 +9,9 @@ function add_install()
touch INSTALL
if query "Do you want the default_install function dumped into the INSTALL
file" "n"
then
- (declare -f real_default_install | tail -n -2 | head -n 1) > INSTALL
+ dump_default_function install > INSTALL
else
- echo "default_install" > INSTALL
+ echo "default_install &&" > INSTALL
fi
$EDITOR INSTALL
}
diff --git a/var/lib/quill/modules/libpre_build
b/var/lib/quill/modules/libpre_build
index b206028..6deb2f1 100644
--- a/var/lib/quill/modules/libpre_build
+++ b/var/lib/quill/modules/libpre_build
@@ -17,9 +17,9 @@ function add_pre_build()
touch PRE_BUILD
if query "Do you want the default_pre_build function dumped into the
PRE_BUILD file" "n"
then
- (declare -f real_default_pre_build | tail -n -2 | head -n 1 | sed
"s:&&:\&\&\n:g") > PRE_BUILD
+ dump_default_function pre_build | sed "s:&&:\&\&\n:g" > PRE_BUILD
else
- echo "default_pre_build" > PRE_BUILD
+ echo "default_pre_build &&" > PRE_BUILD
fi
$EDITOR PRE_BUILD
}
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 9767cc9..c433041 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.1.10
+0.1.10.1




Archive powered by MHonArc 2.6.24.

Top of Page