Skip to Content.
Sympa Menu

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

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 quill by Jaka Kranjc (aa1c3ed6327ed15c01fe71648c1a590b59df4151)
  • Date: Mon, 1 Dec 2008 04:26:19 -0600

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

todo | 2 +-
usr/bin/quill | 5 +++--
var/lib/quill/ChangeLog | 6 ++++++
var/lib/quill/modules/libdepends | 2 +-
var/lib/quill/modules/libupdate | 2 +-
var/lib/quill/modules/site_handlers/libfreshmeatxml | 2 +-
var/lib/quill/version | 2 +-
7 files changed, 14 insertions(+), 7 deletions(-)

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

* quill: run quillrc, don't just suggest it when in trouble
* libupdate, libdepends: sort | uniq is identical to sort -u
* libfreshmeatxml: properly format the long description

diff --git a/todo b/todo
index b897b03..0c18fe2 100644
--- a/todo
+++ b/todo
@@ -18,7 +18,6 @@ improvements in the standard mode:

fmxml:
* dump xml-grep (awk, sed)?
- * redo html parsing

documentation:
* write a manpage
@@ -26,6 +25,7 @@ documentation:
modules:
* a try-all switch with some basic apriori module reckognition support
* extract the common code
+ * redo html parsing (strip first?)

overall:
* Improve scripting support to make it possible to write alternate
interfaces for it
diff --git a/usr/bin/quill b/usr/bin/quill
index 1379a4d..f5cb833 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -115,8 +115,9 @@ fi
# we should do some quillrc sanity checking someday
[[ ! -d $QUILL_SPELL_DIR ]] &&
error_msg "Bad QUILL_SPELL_DIR ($QUILL_SPELL_DIR)!" &&
- echo "Try running quill -r" &&
- exit 7
+ echo "Running quill --reconfigure in 3 seconds" &&
+ sleep 3 &&
+ quillrc

PROMPT_DELAY="31557807"
BUILD_API=2
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index ac8f39b..7441081 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * quill: run quillrc, don't just suggest it when in trouble
+ * libupdate, libdepends: sort | uniq is identical to sort -u
+ * libfreshmeatxml: properly format the long description
+ * version: 0.3.0-rc8
+
2008-11-30 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* quill: redid the input parsing - now uses the powerful getopt
* libcore: removed now unneeded check_parameter
diff --git a/var/lib/quill/modules/libdepends
b/var/lib/quill/modules/libdepends
index 666c0ed..1f2f0b4 100644
--- a/var/lib/quill/modules/libdepends
+++ b/var/lib/quill/modules/libdepends
@@ -11,7 +11,7 @@ function query_spell_dependencies() {
query_msg "Please enter the dependencies(non optional) \
of the spell if any:"
read "SPELL_DEPENDENCIES"
- SPELL_DEPENDENCIES=$(tr ',' ' ' <<< "$SPELL_DEPENDENCIES" | sort | uniq)
+ SPELL_DEPENDENCIES=$(tr ',' ' ' <<< "$SPELL_DEPENDENCIES" | sort -u)
fi
}

diff --git a/var/lib/quill/modules/libupdate b/var/lib/quill/modules/libupdate
index a717db0..f55b24d 100644
--- a/var/lib/quill/modules/libupdate
+++ b/var/lib/quill/modules/libupdate
@@ -289,7 +289,7 @@ function main_update_loop() {

#fetch current versions, ignoring SCM ones
versions=( $(sed -n 's/\s*\<VERSION=//p' DETAILS |
- grep -Eiv '\$[(]date *+|cvs|svn|tla|git|scm' | sort | uniq) )
+ grep -Eiv '\$[(]date *+|cvs|svn|tla|git|scm' | sort -u) )
[[ -z ${versions[@]} ]] && error_msg "No versions to update!" && continue

message "Current relevant version(s): ${versions[@]}"
diff --git a/var/lib/quill/modules/site_handlers/libfreshmeatxml
b/var/lib/quill/modules/site_handlers/libfreshmeatxml
index a217754..4e2fc02 100644
--- a/var/lib/quill/modules/site_handlers/libfreshmeatxml
+++ b/var/lib/quill/modules/site_handlers/libfreshmeatxml
@@ -72,7 +72,7 @@ function quill_fmxml_core() {
SPELL_LICENSE="$(awk '{print $NF}' <<< "$SPELL_LICENSE" | tr -d '()')"
fi
SPELL_SHORT_DESCRIPTION="$(quill_fmxml_grab_from_xml desc_short
${FRESHMEAT_FILE}|sed 's/\r//g')"
- quill_fmxml_grab_from_xml desc_full ${FRESHMEAT_FILE} |fmt >
${QUILL_TMP_DIR}/${SPELL_NAME}
+ quill_fmxml_grab_from_xml desc_full ${FRESHMEAT_FILE} |fmt -w 80 -s >
${QUILL_TMP_DIR}/${SPELL_NAME}
}
#---
##
diff --git a/var/lib/quill/version b/var/lib/quill/version
index aff80e2..3a24ae5 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.3.0-rc7
+0.3.0-rc8



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (aa1c3ed6327ed15c01fe71648c1a590b59df4151), Jaka Kranjc, 12/01/2008

Archive powered by MHonArc 2.6.24.

Top of Page