Skip to Content.
Sympa Menu

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

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 (8be329ee7e62eb7588245da3af50ac66e03eebfe)
  • Date: Thu, 18 Jan 2007 15:52:15 -0600

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

usr/bin/quill | 22 ++--------------------
var/lib/quill/ChangeLog | 4 ++++
var/lib/quill/modules/libcore | 26 ++++++++++++++++++++++++++
var/lib/quill/version | 2 +-
4 files changed, 33 insertions(+), 21 deletions(-)

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

* quill: moved purging to libcore
* libcore: made quill_purge run a safe quill_rc

diff --git a/usr/bin/quill b/usr/bin/quill
index b6d99bd..b89b742 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -65,26 +65,7 @@ while [ -n "$1" ]; do
quill_help 101
export QUILL_CPAN_MODE="on"; export QUILL_TARGET="$2"
shift 2 ;;
- --purge|-p)
- message -n "Purging ... "
- if [[ $2 == "tmp" ]]
- then
- [[ -d $QUILL_TMP_DIR ]] && rm -rf $QUILL_TMP_DIR/*
- elif [[ $2 == "spells" ]]
- then
- [[ -d $QUILL_SPELL_DIR ]] && rm -rf $QUILL_SPELL_DIR/*
- else
- [[ -d $QUILL_TMP_DIR ]] && [[ -d $QUILL_SPELL_DIR ]] &&
rm -rf $QUILL_SPELL_DIR/* $QUILL_TMP_DIR/*
- fi
-
- rc=$?
- if [[ $rc == 0 ]]
- then
- message "done."
- else
- message "${PROBLEM_COLOR}failed!$DEFAULT_COLOR"
- fi
- exit $rc ;;
+ --purge|-p) export QUILL_MODE="purge"; quill_purge $2 ;;
--update|-u) export QUILL_UPDATE="on" QUILL_TARGET="$2"; shift 2 ;;
--apprentice|-a) export QUILL_MODE="apprentice"; shift 1 ;;
--mage|-m) export QUILL_MODE="mage"; shift 1 ;;
@@ -108,6 +89,7 @@ do
done

quill_rc
+
# we should do some quillrc sanity checking someday
[[ ! -d $QUILL_SPELL_DIR ]] &&
echo "PEBKAC: bad QUILL_SPELL_DIR ($QUILL_SPELL_DIR)" &&
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 95589ba..287a514 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,4 +1,8 @@
2007-01-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * quill: moved purging to libcore
+ * libcore: made quill_purge run a safe quill_rc
+
+2007-01-18 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* quill: made the update stop if no versions were updated
moved some more code to libupdate
ask to remove signatures if they don't seem to be needed anymore
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 24fef82..00cf977 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -222,6 +222,32 @@ function quill_final_put_in_grimoire() {
}

#---
+## @Synopsis cleans out $QUILL_TMP_DIR and/or $QUILL_SPELL_DIR
+#---
+function quill_purge() {
+ quill_rc
+ message -n "Purging ... "
+ if [[ $1 == "tmp" ]]
+ then
+ [[ -d $QUILL_TMP_DIR ]] && rm -rf $QUILL_TMP_DIR/*
+ elif [[ $1 == "spells" ]]
+ then
+ [[ -d $QUILL_SPELL_DIR ]] && rm -rf $QUILL_SPELL_DIR/*
+ else
+ [[ -d $QUILL_TMP_DIR ]] && [[ -d $QUILL_SPELL_DIR ]] && rm -rf
$QUILL_SPELL_DIR/* $QUILL_TMP_DIR/*
+ fi
+
+ rc=$?
+ if [[ $rc == 0 ]]
+ then
+ message "done."
+ else
+ message "${PROBLEM_COLOR}failed!$DEFAULT_COLOR"
+ fi
+ exit $rc ;;
+}
+
+#---
## @Synopsis dumps the default spell file function, taking into
## account that devel has a new spell file inheritance scheme
#---
diff --git a/var/lib/quill/version b/var/lib/quill/version
index d5b3fd7..0e24a92 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.1.10.4
+0.1.12



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

Archive powered by MHonArc 2.6.24.

Top of Page