Skip to Content.
Sympa Menu

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

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 (39ec90cfaa5f484808938576d160cbd7cef25a3f)
  • Date: Wed, 11 Apr 2007 07:12:04 -0500

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

todo | 5 +++++
usr/bin/quill | 8 ++------
var/lib/quill/ChangeLog | 5 +++++
var/lib/quill/modules/libcore | 29 ++++++++++++++++++++++++++---
var/lib/quill/version | 2 +-
5 files changed, 39 insertions(+), 10 deletions(-)

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

* libcore: made the url checkers timeout after 30s
* libcore, quill: added check_description_wrap

diff --git a/todo b/todo
index 57a37e3..1a44499 100644
--- a/todo
+++ b/todo
@@ -10,11 +10,16 @@ new menu choices

* 'Convert to upstream signing'
try automatically on updates (check for .sig. .asc)?
+ downloadable or manually included

* 'list/remove files?'

+ * 'Manage CONFIGURE options'
+
update mode:
* clean the namespace by moving more stuff into functions
+ * research possible use of the sorcery url verification code
+ * plug other linters at the end of the update and move them all in liblint

improvements in the standard mode:
* use some of the functions from update mode,
diff --git a/usr/bin/quill b/usr/bin/quill
index 209cf4e..38989f4 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -4,12 +4,6 @@
## @Copyright Copyright 2006-2007 SourceMage GNU/Linux
## @License GPL v2 or higher
##
-## @ToDo Add option to use upstream gpg signature as included or
-## @ToDo downloadable .sig file
-## @ToDo Put a multiversion option
-## @ToDo Interface to add CONFIGURE options
-## @ToDo Make quill the be-all for spells
-##
## Asks the user in simple questions about generating a spell.
## @Globals QUILL_VERSION QUILL_MODE HISTORY_DATE QUILL_HOME_DIR
QUILL_QUILLRC
## @Globals QUILL_OLD_QUILLRC QUILL_SPELL_DIR QUILL_TMP_DIR QUILL_LIB_DIR
@@ -200,6 +194,8 @@ then
# check that all files are executable
check_executable_bits

+ check_description_wrap
+
rm DETAILS.orig
if query "Do you want to review the update or add custom
modifications?" y
then
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 3f10cae..2f9802b 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,4 +1,9 @@
2007-04-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libcore: made the url checkers timeout after 30s
+ * libcore, quill: added check_description_wrap
+ * version: 0.2.4-rc14
+
+2007-04-11 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcore: forgot a HISTORY entry when manually updating the source
urls
* libhistory: made adding entries idempotent, more exotic field
delimiter
* version: 0.2.4-rc14
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 2abe801..75c2c5f 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -345,7 +345,7 @@ function check_source_url() {

if grep -q ftp:// <<< "$su"
then
- wget -O - -S "${su%/*}/" 2>&1 | grep -q "${su##*/}"
+ wget -O - -S "${su%/*}/" -T 30 2>&1 | grep -q "${su##*/}"
rc=$?
elif grep -q http:// <<< "$su"
then
@@ -370,7 +370,7 @@ function check_source_url() {
## @Globals none
#---
function check_url() {
- wget -S --spider "$1" 2>&1 | grep -Eq "ERROR 404|service not known|301
Moved"
+ wget -S --spider -T 30 "$1" 2>&1 | grep -Eq "ERROR 404|service not
known|301 Moved"
# reverse the return value, so the function returns 0 on succes
if [[ $? == 1 ]]
then
@@ -489,7 +489,7 @@ function clear_html_specials(){
## @Synopsis checks if spell files are executable and possibly fixes them
## @Synopsis it ignores known files that don't need it
##
-## @Globals
+## @Globals QUILL_SPELL_DIR SPELL_NAME
#---
function check_executable_bits(){
local file
@@ -506,6 +506,29 @@ function check_executable_bits(){
}

#---
+## @Synopsis ensures the long description is wrapped properly
+##
+## @Globals none
+#---
+function check_description_wrap(){
+
+ sed -n '/cat *<< *EOF/,/EOF/p' DETAILS > long.description
+ awk '{ if(length($0)>a) a=length($0)} \
+ END{if(a>80)exit 1; else exit 0}' \
+ long.description && return 0
+
+ sed -i '/cat *<< *EOF/,/EOF/d' DETAILS
+ sed -i '1d; $d' long.description
+ fmt -w 80 long.description > long.description.2
+ mv long.description.2 long.description
+ echo 'cat << EOF' >> DETAILS
+ cat long.description >> DETAILS
+ echo 'EOF' >> DETAILS
+ add_history_entry "DETAILS: fixed long description wrap"
+
+}
+
+#---
## @Synopsis prints a colored error message
##
## @Globals none
diff --git a/var/lib/quill/version b/var/lib/quill/version
index bde8220..474cff3 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.2.4-rc14
+0.2.4-rc15



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (39ec90cfaa5f484808938576d160cbd7cef25a3f), Jaka Kranjc, 04/11/2007

Archive powered by MHonArc 2.6.24.

Top of Page