Skip to Content.
Sympa Menu

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

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 (331522866d1c99dd60b7915dfc6c9b964e019953)
  • Date: Sat, 5 Aug 2006 15:14:12 -0500

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

usr/bin/quill | 17 ++++++++++-------
var/lib/quill/ChangeLog | 3 +++
var/lib/quill/modules/libcore | 10 +++++-----
3 files changed, 18 insertions(+), 12 deletions(-)

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

quill: split the sourcing, so parameter parsing occurs earlier - faster
two trivial speedups and cleaned todo

commit 29dfe1b8bd76519bdad259f6eed0bedf7bbba686
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

libcore: add missing "
restore ++version

commit 060c17fd2a057bf29d23aa6abace331316c42f60
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "Minor fix"

This reverts d771a8348674a7c43d559f236e0d4d9b618095fd commit.

commit 02e07f5416c0bdb75f37d82612e953844d2adc29
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

Revert "Minor fixes due to ()"

This reverts 3581451e83b9d43d1133f45cf065e5ced5a3c538 commit.

diff --git a/usr/bin/quill b/usr/bin/quill
index 526c71f..aab0069 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -9,15 +9,12 @@ ## @ToDo Add option to use upstream gpg
## @ToDo downloadable .sig file
## @ToDo Put a multiversion option
## @ToDo Make an option to edit all the existing files after generation
-## @ToDo Make configuring optional depends a must - DONE
-## @ToDo Add logic to quill to make it possible to use optional_depends
- DONE
## @ToDo single line or multiline depending on the length of line if
## @ToDo <80 single else multi
## @ToDo Interface to add CONFIGURE options
## @ToDo Automated bugcli submissions of spells
## @ToDo Make a tar.bz2 of the spell immediately
## @ToDo Automatic inclusion into a grimoire when finished
-## @ToDo Make it use the ~/.sourcemage dir for config - DONE
## @ToDo Add cmdline options to make it possible to autoscript it
## @ToDo Add a better configuration interface(dialog based I hope)
## @ToDo Make it possible to also update spells using quill
@@ -41,16 +38,20 @@ ## @Thanks To all testers
## @Contribution abouter, lynxlynxlynx, iuso
##
#---
-QUILL_VERSION="$(cat /var/lib/quill/version)"
+QUILL_VERSION="$(< /var/lib/quill/version)"
#---
-## Some basic stuff that should be loaded and set
-. /etc/sorcery/config
+## really basic stuff that should be loaded and set
+. /var/lib/sorcery/modules/libmedia
+LOCAL_MEDIA_CONFIG=/etc/sorcery/local/media source /etc/sorcery/media
+function message() { echo -e "$@"; }
+## end of skeletal prerequisites - we get the rest later
+
for i in /var/lib/quill/modules/lib*
do
. $i
done
QUILL_MODE="apprentice"
-CURRENTPWD="$(pwd)"
+CURRENTPWD="$PWD"
HISTORY_DATE="$(date +%Y-%m-%d)"
#---
## Not really a function it's supposed to parse the command line parameters
@@ -77,6 +78,8 @@ while [ -n "$1" ]; do
shift
fi
done
+unset -f message
+. /etc/sorcery/config

QUILL_HOME_DIR=~/.sourcemage/quill
QUILL_QUILLRC=${QUILL_HOME_DIR}/quillrc
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index f993bb4..4745f1a 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,3 +1,6 @@
+2006-08-05 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * quill: split the sourcing, so parameter parsing occurs earlier
+
2006-08-05 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
* libcore: modified the message, added back the need for space
delimited
lists
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index d4ba180..5b6afb1 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -79,10 +79,10 @@ function quill_welcome() {
message "This makes an immediately useable spell from some minor data."
message "Does not create a \$SPELL-\$VERSION SOURCE construct but uses
real filename"
message
"-----------------------------------------------------------------------------"
- message "The spell will be put into a grimoire/section you define if you
choose to"
+ message "The spell will be put into a grimoire/section you define(if you
choose to)"
message "and a tar.bz2 file will be created in $QUILL_SPELL_DIR."
message
"-----------------------------------------------------------------------------"
- message "All lists should be space delimited - dependencies and optional
dependencies"
+ message "All lists should be space delimited(dependencies and optional
dependencies)"
message
"-----------------------------------------------------------------------------"
}

@@ -117,10 +117,10 @@ ## @Synopsis function to put the spell i
#---
function quill_final_put_in_grimoire() {
message "You have selected to put the spell into the grimoire"
- message "Please note there will also be a spell tarball - if so desired
in"
+ message "Please note there will also be a spell tarball(if so desired) in"
message "${USER_HOME}/${QUILL_SPELLDIR} as will be a spelldir"
message
"-----------------------------------------------------------------------------"
- message "Into which grimoire do you wish to put the spell FULL path to it:"
+ message "Into which grimoire do you wish to put the spell(FULL path to
it):"
# quill_list_grimoires
read QUILL_GRIM_NAME
message "Into which section do you wish to put the spell:"
@@ -143,7 +143,7 @@ #---
## @Synopsis function that displays help and exits
#---
function quill_help() {
- message -e "USAGE: quill [OPTIONS]
+ message "USAGE: quill [OPTIONS]

OPTIONS:
--fmxml, -f <SPELL> get spell data from Freshmeat if possible



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (331522866d1c99dd60b7915dfc6c9b964e019953), Jaka Kranjc, 08/05/2006

Archive powered by MHonArc 2.6.24.

Top of Page