Skip to Content.
Sympa Menu

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

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 (3f4e8bab1b451f658bc9496ee8267e43055832a2)
  • Date: Mon, 1 Dec 2008 05:03:57 -0600

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

todo | 4 ---
usr/bin/quill | 7 ++++--
var/lib/quill/ChangeLog | 7 ++++++
var/lib/quill/modules/libcore | 1
var/lib/quill/modules/libupdate | 44
++++++++++++++++++++++++++++++++++++++++
var/lib/quill/version | 2 -
6 files changed, 58 insertions(+), 7 deletions(-)

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

Edit, list and remove arbitrary spell files from within quill

* quill: run quill_rc, not quillrc when in trouble
added "list/edit/remove spell file" menu option
* libupdate: implemented "list/edit/remove spell file"
* libcore: skip DETAILS.orig in quill_edit

diff --git a/todo b/todo
index 0c18fe2..278aede 100644
--- a/todo
+++ b/todo
@@ -4,10 +4,6 @@ new menu choices
branches
SCM: wierd versions; also needs the autoupdate stuff; only for -w

- * 'list/remove files?'
-
- * 'Manage CONFIGURE options'
-
update mode:
* plug other linters at the end of the update and move them all in liblint
* add mirror support for SOURCE_URLs when adding new sources
diff --git a/usr/bin/quill b/usr/bin/quill
index f5cb833..8c9788f 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -117,7 +117,7 @@ fi
error_msg "Bad QUILL_SPELL_DIR ($QUILL_SPELL_DIR)!" &&
echo "Running quill --reconfigure in 3 seconds" &&
sleep 3 &&
- quillrc
+ quill_rc

PROMPT_DELAY="31557807"
BUILD_API=2
@@ -153,7 +153,7 @@ then
'Switch to upstream gpg verification' \
'Deprecate the spell (also for renames)' \
'Manage/add PRE_BUILD and patches' \
- '--NOOP--' \
+ 'List/Edit/Remove spell files' \
'--NOOP--' \
'--NOOP--' \
'Copy it here from the grimoire or QUILL_GIT_DIR' \
@@ -231,6 +231,9 @@ then
"${actions[5]}") # 'Manage/add PRE_BUILD and patches'
pre_build_menu
;;
+ "${actions[6]}") # 'List/Edit/Remove spell files'
+ file_menu
+ ;;
"${actions[9]}") #"Copy it here from the grimoire or QUILL_GIT_DIR"
ask_and_copy_over || continue
;;
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index 7441081..44cb049 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -1,4 +1,11 @@
2008-12-01 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * quill: run quill_rc, not quillrc when in trouble
+ added "list/edit/remove spell file" menu option
+ * libupdate: implemented "list/edit/remove spell file"
+ * libcore: skip DETAILS.orig in quill_edit
+ * version: 0.3.0-rc9
+
+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
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 24ba348..77d7a9d 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -161,6 +161,7 @@ function quill_edit() {
cd ${QUILL_SPELL_DIR}/${SPELL_NAME}
for spell_file in ${1:-*}
do
+ [[ $spell_file == DETAILS.orig ]] && continue
type=$(file -bi $spell_file)
if grep -q "text/" <<< "$type"
then
diff --git a/var/lib/quill/modules/libupdate b/var/lib/quill/modules/libupdate
index f55b24d..6ecc468 100644
--- a/var/lib/quill/modules/libupdate
+++ b/var/lib/quill/modules/libupdate
@@ -139,6 +139,50 @@ function user_increment_patchlevel() {
}

#---
+## @Synopsis Edit, list and remove arbitrary spell files
+#---
+function file_menu() {
+ local actions choice file
+
+ actions=('List files' \
+ 'Edit files' \
+ 'Remove files' \
+ 'Return to the main menu' )
+ query_list "What do you want to do?" choice "Return to the main menu"
"${actions[@]}"
+
+ case "$choice" in
+ "${actions[0]}")
+ ls -Rl --color -I "*.orig"
+ echo
+ echo "Press any key to continue"
+ read -n1 ;;
+ "${actions[1]}")
+ while true; do
+ query_list "Which file do you want to edit?" file none \
+ all $(find -type f -and ! -name DETAILS.orig -printf "%P\n") none
+ case $file in
+ none) break;;
+ all) quill_edit; echo ;;
+ *) quill_edit $file; echo ;;
+ esac
+ add_history_entry "$file: changed blabla"
+ done ;;
+ "${actions[2]}")
+ while true; do
+ query_list "Which file do you want to remove?" file none \
+ $(find -type f -and ! -name DETAILS.orig -printf "%P\n") none
+ [[ $file == none ]] && break
+ rm $file
+ echo "$file removed!"
+ echo
+ add_history_entry "$file: removed, no longer needed"
+ done ;;
+ "${actions[3]}")
+ return ;;
+ esac
+}
+
+#---
## @Synopsis The core function that ties all the version update stuff
##
## @Globals SPELL_VERSION SPELL_UPDATED GURU_GPGKEY QUILL_SPELL_DIR "version"
diff --git a/var/lib/quill/version b/var/lib/quill/version
index 3a24ae5..629800a 100644
--- a/var/lib/quill/version
+++ b/var/lib/quill/version
@@ -1 +1 @@
-0.3.0-rc8
+0.3.0-rc9



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

Archive powered by MHonArc 2.6.24.

Top of Page