[SM-Commit] GIT changes to master quill by Bor Kraljič (acee001d491b2a42d1a0af180fb73a5c216c5d8a)

Bor Kraljič scm at sourcemage.org
Fri Aug 13 14:42:55 EDT 2010


GIT changes to master quill by Bor Kraljič <pyrobor at ver.si>:

 usr/bin/generate-quill-docs.sh                      |   56 ++++++++++++++++++++
 usr/bin/quill                                       |   15 +++--
 var/lib/quill/modules/libbuild                      |    4 +
 var/lib/quill/modules/libcompat                     |   24 +++++++-
 var/lib/quill/modules/libconflicts                  |    4 +
 var/lib/quill/modules/libcopy                       |    4 +
 var/lib/quill/modules/libcore                       |    5 +
 var/lib/quill/modules/libdepends                    |   11 +++
 var/lib/quill/modules/libdeprecation                |   21 +++++--
 var/lib/quill/modules/libdesktop                    |    4 +
 var/lib/quill/modules/libdetails                    |   16 +++++
 var/lib/quill/modules/libgpg                        |   10 +++
 var/lib/quill/modules/libhistory                    |    2 
 var/lib/quill/modules/libinstall                    |    6 ++
 var/lib/quill/modules/libpre_build                  |    9 +++
 var/lib/quill/modules/libprepare                    |    4 +
 var/lib/quill/modules/libprovides                   |    4 +
 var/lib/quill/modules/libupdate                     |   10 ++-
 var/lib/quill/modules/site_handlers/libfreshmeatxml |    4 +
 var/lib/quill/modules/site_handlers/libfsfdirectory |   10 ++-
 var/lib/quill/modules/site_handlers/libgna          |    7 +-
 var/lib/quill/modules/site_handlers/libperlcpan     |    6 ++
 var/lib/quill/modules/site_handlers/librubyraa      |    8 ++
 var/lib/quill/modules/site_handlers/libsavane       |    6 +-
 var/lib/quill/modules/site_handlers/libsavannah     |    7 +-
 25 files changed, 231 insertions(+), 26 deletions(-)

New commits:
commit acee001d491b2a42d1a0af180fb73a5c216c5d8a
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    script to generate html doc pages. based on bashdoc generate-smgl-docs.sh

commit a3088b13979297be83f1242c25348cb996129049
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    mostly just added "#---" so now bashdoc.sh builds nice html pages

commit 75984e554d353feb9f986cfb6413d34d7db4350a
Author: Bor Kraljič <pyrobor at ver.si>
Commit: Bor Kraljič <pyrobor at ver.si>

    sort the files in file_menu so they are easier to find (bug #15432)

diff --git a/usr/bin/generate-quill-docs.sh b/usr/bin/generate-quill-docs.sh
new file mode 100755
index 0000000..c19dd66
--- /dev/null
+++ b/usr/bin/generate-quill-docs.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+#
+# This script will generate bash documentation (for as far as it has been made
+# available in the code) from Quill.
+#
+BIN=/usr/bin
+DOCDIR=/usr/share/doc/quill/htmldocs
+BASHDOC=$BIN/bashdoc.sh
+FLOW=$BIN/flow.sh
+SRC2HTML=$BIN/src2html.sh
+PROJECT=Quill
+
+QUIET=${QUIET:--q -q}
+
+SCRIPTS="/var/lib/quill/modules/lib* /var/lib/quill/modules/site_handlers/* \
+/usr/bin/quill"
+#exclude non-sorcery files, like backups~ or numbered versions
+for FILE in $SCRIPTS
+do
+        if grep -q "[0-9]" <<< $FILE; then
+                if grep -Eq "(libgcc2|api[12])" <<< $FILE; then
+                        SCRIPTS2="$SCRIPTS2 $FILE"
+                fi
+        elif grep -q '~' <<< $FILE; then
+                true
+        else
+                SCRIPTS2="$SCRIPTS2 $FILE"
+        fi
+done
+SCRIPTS="$SCRIPTS2"
+
+# make the bashdoc dir
+if [ -d $DOCDIR ] ; then
+        rm -rf $DOCDIR
+        mkdir -p $DOCDIR
+else
+        mkdir -p $DOCDIR
+fi
+
+# generate docs for libs
+if [  -x  "$BASHDOC"  ] ; then
+        $BASHDOC ${QUIET} -p $PROJECT -o $DOCDIR $SCRIPTS
+else
+        echo "The bashdoc tools are not installed, please cast bashdoc!"
+fi
+
+${SRC2HTML} --funcs $DOCDIR $SCRIPTS
+if which dot >/dev/null 2>&1 ; then
+        ${FLOW} --funcs $DOCDIR --exclude debug --exclude query \
+                --exclude message --exclude error_msg $SCRIPTS
+else
+        echo "No graphviz found, not generating images."
+fi
+
+# end
diff --git a/usr/bin/quill b/usr/bin/quill
index f20b13e..fbcd1e6 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -4,7 +4,6 @@
 ## @Copyright Copyright 2006-2008 Source Mage GNU/Linux
 ## @License GPL v2 or higher
 ##
-## 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
 ## @Globals QUILL_MODULES QUILL_CONFIG_VERSION QUILL_OUR_CONFIG_VERSION EDITOR
@@ -19,13 +18,20 @@
 ## @Thanks To all testers
 ## @Contribution abouter, lynxlynxlynx, iuso
 ##
+## A spell creator and updater script
 #---
+
 QUILL_VERSION="$(< /var/lib/quill/version)"
-#---
 ## 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 "$@"; }
+
+#---
+## Simple echo function
+#---
+function message() {
+  echo -e "$@"
+}
 . /var/lib/quill/modules/libcore
 ## end of skeletal prerequisites - we get the rest later
 
@@ -42,9 +48,7 @@ QUILL_MODULES=$QUILL_LIB_DIR/modules
 QUILL_OUR_CONFIG_VERSION=5
 QUILL_CONFIG_VERSION=$QUILL_OUR_CONFIG_VERSION
 
-#---
 ## Parse the command line parameters and arguments via getopt
-#---
 QUILL_CMDLINE=$(getopt -o fcysngFHup::amwrhv -l \
   fmxml,perlcpan,rubyraa,savane,savannah,gna,fsf,hackagedb,update,help,purge:: \
   -n 'quill' -- "$@")
@@ -125,7 +129,6 @@ load_build_api
 mkdir -p $QUILL_TMP_DIR
 SPELL_UPDATED=n
 
-#---
 ## Questions and stuff
 quill_welcome
 if [[ ! -z $QUILL_FETCH_MODE ]]
diff --git a/var/lib/quill/modules/libbuild b/var/lib/quill/modules/libbuild
index 1d2d186..fcc3dc3 100644
--- a/var/lib/quill/modules/libbuild
+++ b/var/lib/quill/modules/libbuild
@@ -3,8 +3,10 @@
 ## @Synopsis BUILD module for quill
 #---
 
+#---
 ##
 ## @Globals QUILL_FETCH_MODE BUILDISON
+#---
 function query_spell_build() {
   if [[ "$QUILL_FETCH_MODE" != "cpan" ]]; then
      if query "Will you be adding a custom BUILD file:" "n"
@@ -14,8 +16,10 @@ function query_spell_build() {
   fi
 }
 
+#---
 ##
 ## @Globals QUILL_FETCH_MODE QUILL_TMP_DIR QUILL_SPELL_DIR SPELL_NAME EDITOR
+#---
 function add_build() {
   if [[ "$QUILL_FETCH_MODE" == "cpan" ]]; then
     cp ${QUILL_TMP_DIR}/${SPELL_NAME}-BUILD ${QUILL_SPELL_DIR}/${SPELL_NAME}/BUILD
diff --git a/var/lib/quill/modules/libcompat b/var/lib/quill/modules/libcompat
index bf2e7ae..a5dab3a 100644
--- a/var/lib/quill/modules/libcompat
+++ b/var/lib/quill/modules/libcompat
@@ -1,4 +1,9 @@
 #!/bin/bash
+#---
+## @Synopsis COMPAT module for quill
+#---
+
+
 # 1.14 sorcery function
 if ! declare -f codex_get_spell_paths &> /dev/null; then
   function codex_get_spell_paths() {
@@ -10,8 +15,10 @@ if ! declare -f codex_get_spell_paths &> /dev/null; then
   }
 fi
 
-# 1.13 workaround sorcery bug #13001
 unset -f url_ftp_verify &&
+#---
+## 1.13 workaround sorcery bug #13001
+#---
 function url_ftp_verify() {
   local  URL=$1
 
@@ -31,8 +38,11 @@ function url_ftp_verify() {
   fi
 }
 
-# too many menu options for 1.13
+
 unset -f select_list &&
+#---
+## too many menu options for 1.13
+#---
 function select_list()
 {
     local i
@@ -61,6 +71,11 @@ function select_list()
 }
 
 unset -f select_list_sub &&
+#---
+## @param return var
+## @param hashname
+## @param message
+#---
 function select_list_sub() {
   local returnvar=$1
   local hashname=$2
@@ -80,6 +95,9 @@ function select_list_sub() {
 }
 
 unset -f url_https_verify &&
+#---
+##
+#---
 function url_https_verify() {
   local  URL=$1
 
@@ -93,9 +111,11 @@ function url_https_verify() {
   fi
 }
 
+#---
 # permanent override; since we don't use timeout, no need for
 # treating the first char specially, which means it can be deleted
 # if the user makes an error
+#---
 function real_query_string() {
     debug  "libmisc" "Running quill_question() with the following arguments: '$1' and '$2'"
 
diff --git a/var/lib/quill/modules/libconflicts b/var/lib/quill/modules/libconflicts
index 16dda71..c9f9929 100644
--- a/var/lib/quill/modules/libconflicts
+++ b/var/lib/quill/modules/libconflicts
@@ -4,15 +4,19 @@
 ## @Note DONE
 #---
 
+#---
 ##
 ## @Globals SPELL_CONFLICTS
+#---
 function query_spell_conflicts() {
   query_msg "Please enter all conflicting spell names if any:"
   read "SPELL_CONFLICTS"
 }
 
+#---
 ##
 ## @Globals CONFLICTSISON SPELL_CONFLICTS
+#---
 function add_conflicts() {
   touch CONFLICTS
   CONFLICTSISON="CONFLICTS, "
diff --git a/var/lib/quill/modules/libcopy b/var/lib/quill/modules/libcopy
index 66358d2..a514f70 100644
--- a/var/lib/quill/modules/libcopy
+++ b/var/lib/quill/modules/libcopy
@@ -1,5 +1,9 @@
 #!/bin/bash
 #---
+## @Synopsis libcopy
+#---
+
+#---
 ## @Synopsis Copies the new spell somewhere under $QUILL_GIT_DIR
 ##
 ## @Globals QUILL_GIT_DIR SPELL_NAME QUILL_SUDO
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 30badaf..774a28d 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -1,5 +1,9 @@
 #!/bin/bash
 #---
+## @Synopsis libcore
+#---
+
+#---
 ## @Synopsis query_list function from init-manager
 ## $1 - the question
 ## $2 - the VARIABLE to which to store the answer
@@ -173,6 +177,7 @@ QUA
 ## @Synopsis The welcome message for quill
 ##
 ## @Globals QUILL_SPELL_DIR
+#---
 function quill_welcome() {
   message "Welcome to Source Mage GNU/Linux quill - a spell creator and updater script."
   message "-----------------------------------------------------------------------------"
diff --git a/var/lib/quill/modules/libdepends b/var/lib/quill/modules/libdepends
index 1c7fdad..a38444f 100644
--- a/var/lib/quill/modules/libdepends
+++ b/var/lib/quill/modules/libdepends
@@ -3,8 +3,10 @@
 ## @Synopsis libdepends
 #---
 
+#---
 ##
 ## @Globals SPELL_DEPENDENCIES
+#---
 function query_spell_dependencies() {
   if ! [[ $SPELL_DEPENDENCIES ]] ||
      ! query "Are \"${SPELL_DEPENDENCIES}\" the proper dependencies for this spell" y
@@ -16,15 +18,19 @@ of the spell if any:"
 fi
 }
 
+#---
 ##
 ## @Globals SPELL_OPTIONAL_DEPENDENCIES
+#---
 function query_spell_optional_dependencies() {
   query_msg "Please enter the optional dependencies of the spell if any:"
   read -a "SPELL_OPTIONAL_DEPENDENCIES"
 }
 
+#---
 ##
 ## @Globals DEPENDSISON SPELL_DEPENDENCIES
+#---
 function add_dependencies() {
   local i
 
@@ -36,8 +42,10 @@ function add_dependencies() {
   done
 }
 
+#---
 ##
 ## @Globals DEPENDSISON SPELL_OPTIONAL_DEPENDENCIES
+#---
 function add_optional_dependencies() {
   local dep dep_count
   local SPELL_OPTIONAL_DEPENDENCIES_ENABLED[0]=""
@@ -64,11 +72,14 @@ function add_optional_dependencies() {
 # "optional_depends ${j} \"enabled-option\" \"disabled-option\" \"description\""
 }
 
+#---
 ##
 ## @Globals
+#---
 function add_bs_depends() {
   return
 }
+
 #---
 ##
 ## This software is free software; you can redistribute it and/or modify
diff --git a/var/lib/quill/modules/libdeprecation b/var/lib/quill/modules/libdeprecation
index 300eccf..abc45df 100644
--- a/var/lib/quill/modules/libdeprecation
+++ b/var/lib/quill/modules/libdeprecation
@@ -35,7 +35,10 @@ function deprecate_menu() {
   sleep 5
 }
 
-# start the deprecation
+
+#---
+## start the deprecation
+#---
 function deprecate() {
   local overrides='DOWNLOAD PRE_BUILD BUILD INSTALL'
   local replacement=$1
@@ -99,7 +102,9 @@ na
   unset_spell_paths
 }
 
-# complete the deprecation of a spell
+#---
+## complete the deprecation of a spell
+#---
 function complete_deprecation() {
 
   codex_get_spell_paths $(codex_find_spell_by_name $SPELL_NAME)
@@ -116,7 +121,9 @@ function complete_deprecation() {
   message "$DEFAULT_COLOR"
 }
 
-# recreate DETAILS for a deprecated spell
+#---
+## recreate DETAILS for a deprecated spell
+#---
 function deprecate_details() {
   local replacement=$1
 
@@ -135,7 +142,9 @@ EOFZ
   fi
 }
 
-# ask the user for the replacement spell
+#---
+## ask the user for the replacement spell
+#---
 function get_replacement() {
   local __replacement
   local var=$1
@@ -148,7 +157,9 @@ function get_replacement() {
   upvar $var "$__replacement"
 }
 
-# plain deletes a spell, can't really work
+#---
+## plain deletes a spell, can't really work
+#---
 function delete_spell() {
   local reason=$1
 
diff --git a/var/lib/quill/modules/libdesktop b/var/lib/quill/modules/libdesktop
index eb15ea6..2d52473 100644
--- a/var/lib/quill/modules/libdesktop
+++ b/var/lib/quill/modules/libdesktop
@@ -3,9 +3,11 @@
 ## @Synopsis libdesktop
 #---
 
+#---
 ##
 ## @Globals BUILD_DTFILE SPELL_NAME DTFILE_MENUENTRY DTFILE_EXEC
 ## @Globals DTFILE_MENUPATH DTFILE_ICON DTFILE_TERM
+#---
 query_spell_desktop_file() {
 if query "Will you be adding a custom desktop file?" "n"
 then
@@ -26,9 +28,11 @@ then
 fi
 }
 
+#---
 ##
 ## @Globals SPELL_NAME SPELL_SHORT_DESCRIPTION DTFILE_MENUENTRY SPELL_VERSION
 ## @Globals  DTFILE_EXEC DTFILE_ICON DTFILE_MENUPATH DTFILE_TERM
+#---
 add_desktop_file() {
   mkdir -p desktop
   cd desktop
diff --git a/var/lib/quill/modules/libdetails b/var/lib/quill/modules/libdetails
index d82a026..a3b9a47 100644
--- a/var/lib/quill/modules/libdetails
+++ b/var/lib/quill/modules/libdetails
@@ -5,8 +5,10 @@
 ## and if so, give the user an opportunity to change the value
 #---
 
+#---
 ##
 ## @Globals SPELL_NAME
+#---
 function query_spell_name(){
   #downcase before query
   SPELL_NAME=$(tr '[[:upper:]]' '[[:lower:]]' <<< "$SPELL_NAME")
@@ -19,8 +21,10 @@ function query_spell_name(){
   fi
 }
 
+#---
 ##
 ## @Globals SPELL_SRC_URL
+#---
 function query_spell_source_url(){
   # misc sf fix
   # try to handle as many sf url formats as possible
@@ -48,9 +52,11 @@ if ! [[ $SPELL_SRC_URL ]] ||
 fi
 }
 
+#---
 ## used in update mode only, elsewhere the version is parsed from the filename
 ##
 ## @Globals SPELL_VERSION
+#---
 function query_spell_version(){
   if ! [[ $SPELL_VERSION ]] ||
     ! query "Is $SPELL_VERSION the proper spell version?" y; then
@@ -59,8 +65,10 @@ function query_spell_version(){
   fi
 }
 
+#---
 ##
 ## @Globals SPELL_LICENSE
+#---
 function query_spell_license(){
 if ! [[ $SPELL_LICENSE ]] ||
    ! query "Is $SPELL_LICENSE the proper license?" y; then
@@ -69,8 +77,10 @@ if ! [[ $SPELL_LICENSE ]] ||
 fi
 }
 
+#---
 ##
 ## @Globals SPELL_URL
+#---
 function query_spell_url(){
 if ! [[ $SPELL_URL ]] ||
    ! query "Is $SPELL_URL the proper website?" y; then
@@ -79,8 +89,10 @@ if ! [[ $SPELL_URL ]] ||
 fi
 }
 
+#---
 ##
 ## @Globals SPELL_SHORT_DESCRIPTION
+#---
 function query_spell_short_description(){
 if ! [[ $SPELL_SHORT_DESCRIPTION ]] ||
    ! ( message "${QUERY_COLOR}Is${DEFAULT_COLOR}\n$SPELL_SHORT_DESCRIPTION"
@@ -90,8 +102,10 @@ if ! [[ $SPELL_SHORT_DESCRIPTION ]] ||
 fi
 }
 
+#---
 ##
 ## @Globals EDITOR SPELL_NAME SPELL_DESC_NAME QUILL_TMP_DIR
+#---
 function query_spell_description(){
 local description=${QUILL_TMP_DIR}/${SPELL_DESC_NAME:-${SPELL_NAME}}
 if ! test -f $description ||
@@ -105,7 +119,7 @@ if ! test -f $description ||
 fi
 }
 
-#--
+#---
 ## @Synopsis Assign to SPELL_SRC_FILE the filename and to VERSION the
 ## @Synopsis version number parsed from source url.
 ##
diff --git a/var/lib/quill/modules/libgpg b/var/lib/quill/modules/libgpg
index efb477d..040dedd 100644
--- a/var/lib/quill/modules/libgpg
+++ b/var/lib/quill/modules/libgpg
@@ -1,5 +1,9 @@
 #!/bin/bash
 #---
+## @Synopsis libgpg
+#---
+
+#---
 ## @Synopsis Tries to change the source verification in favour of upstream gpg
 ##
 ## @Globals "version" SPELL_KEYRING SPELL_SIGNATURE SPELL_UPDATED
@@ -202,6 +206,7 @@ function convert_to_upstream_gpg() {
 ## @return 1 otherwise
 ##
 ## @Globals "i" "su" "source"
+#---
 function guess_signature_url() {
   local suffix silent=$1
 
@@ -224,6 +229,7 @@ function guess_signature_url() {
 ##
 ## @Globals SPELL_KEYRING QUILL_SPELL_DIR SPELL_NAME
 ## @Globals QUILL_TMP_DIR
+#---
 function quill_get_spell_keyring() {
   # return if a previous pass already set it
   [[ -n $SPELL_KEYRING ]] && return 0
@@ -290,8 +296,10 @@ function quill_get_spell_keyring() {
 
 }
 
+#---
 ##
 ## @Globals SPELL_SIGNATURE
+#---
 function query_spell_signature(){
   if [[ $SPELL_SIGNATURE ]] &&
     ! query "Is $SPELL_SIGNATURE the proper signature url?" y; then
@@ -305,8 +313,10 @@ function query_spell_signature(){
   done
 }
 
+#---
 ##
 ## @Globals SPELL_KEYRING
+#---
 function query_spell_keyring(){
   while ! [[ $SPELL_KEYRING ]]; do
     query_msg "Please enter the url of the keyring:"
diff --git a/var/lib/quill/modules/libhistory b/var/lib/quill/modules/libhistory
index 2ea049f..e431edc 100644
--- a/var/lib/quill/modules/libhistory
+++ b/var/lib/quill/modules/libhistory
@@ -3,9 +3,11 @@
 ## @Synopsis libhistory
 #---
 
+#---
 ## @param entry without the leading tab, bullet and space
 ##
 ## @Globals HISTORY_DATE GURU_NAME GURU_EMAIL
+#---
 function add_history()
 {
   local title="$HISTORY_DATE $GURU_NAME <$GURU_EMAIL>" files
diff --git a/var/lib/quill/modules/libinstall b/var/lib/quill/modules/libinstall
index 433ff3f..24fac24 100644
--- a/var/lib/quill/modules/libinstall
+++ b/var/lib/quill/modules/libinstall
@@ -3,8 +3,10 @@
 ## @Synopsis libinstall
 #---
 
+#---
 ##
 ## @Globals EDITOR
+#---
 function add_install()
 {
   touch INSTALL
@@ -17,8 +19,10 @@ function add_install()
   $EDITOR INSTALL
 }
 
+#---
 ##
 ## @Globals INSTALLISON
+#---
 function query_spell_install()
 {
 if query "Will you be adding a custom INSTALL file:" "n"
@@ -27,8 +31,10 @@ then
 fi
 }
 
+#---
 ##
 ## @Globals
+#---
 function implement_install_system()
 {
   return
diff --git a/var/lib/quill/modules/libpre_build b/var/lib/quill/modules/libpre_build
index 1b4d70b..28b6fcc 100644
--- a/var/lib/quill/modules/libpre_build
+++ b/var/lib/quill/modules/libpre_build
@@ -3,8 +3,10 @@
 ## @Synopsis libpre_build
 #---
 
+#---
 ##
 ## @Globals PREBUILDISON
+#---
 function query_spell_pre_build()
 {
   if query "Will you be adding a custom PRE_BUILD file:" "n"
@@ -13,8 +15,10 @@ function query_spell_pre_build()
   fi
 }
 
+#---
 ##
 ## @Globals QUILL_TMP_DIR SPELL_NAME
+#---
 function add_pre_build()
 {
   if [[ -e PRE_BUILD ]]; then
@@ -125,7 +129,9 @@ function pre_build_menu() {
   esac
 }
 
+#---
 ## doesn't handle compressed patches
+#---
 function get_patches()
 {
   local _patch patches
@@ -165,6 +171,9 @@ function get_patches()
   upvar "$1" "$_patch"
 }
 
+#---
+## test pre_build
+#---
 function test_pre_build()
 {
   true
diff --git a/var/lib/quill/modules/libprepare b/var/lib/quill/modules/libprepare
index a93946e..c7f3c57 100644
--- a/var/lib/quill/modules/libprepare
+++ b/var/lib/quill/modules/libprepare
@@ -3,8 +3,10 @@
 ## @Synopsis libprepare
 #---
 
+#---
 ##
 ## @Globals PREPAREISON
+#---
 function query_spell_prepare()
 {
 if query "Will you be adding a PREPARE file:" "n"
@@ -13,8 +15,10 @@ then
 fi
 }
 
+#---
 ##
 ## @Globals EDITOR
+#---
 function add_prepare()
 {
   touch PREPARE
diff --git a/var/lib/quill/modules/libprovides b/var/lib/quill/modules/libprovides
index 96e149e..49b9976 100644
--- a/var/lib/quill/modules/libprovides
+++ b/var/lib/quill/modules/libprovides
@@ -4,15 +4,19 @@
 ## @Note DONE
 #---
 
+#---
 ##
 ## @Globals SPELL_PROVIDES
+#---
 function query_spell_provides() {
   query_msg "Please enter provides if any:"
   read "SPELL_PROVIDES"
 }
 
+#---
 ##
 ## @Globals PROVIDESISON SPELL_PROVIDES
+#---
 function add_provides() {
   local n
 
diff --git a/var/lib/quill/modules/libupdate b/var/lib/quill/modules/libupdate
index 49a6dbc..9dc8944 100644
--- a/var/lib/quill/modules/libupdate
+++ b/var/lib/quill/modules/libupdate
@@ -1,5 +1,9 @@
 #!/bin/bash
 #---
+## @Synopsis libcopy
+#---
+
+#---
 ## @Synopsis Sets up some global variables that contain sources and urls
 ## @Synopsis delimited by newlines
 ##
@@ -54,7 +58,9 @@ function update_patchlevel()
   fi
 }
 
+#---
 ## @Globals SPELL_VERSION
+#---
 function update_patchlevel_sub()
 {
   local current_value=$2 action=$3 new_value count
@@ -161,7 +167,7 @@ function file_menu() {
     "${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
+          all $(find -type f -and ! -name DETAILS.orig -printf "%P\n" |sort -f) none
         [[ $file == none ]] && break
         [[ $file != HISTORY ]] && add_history_entry "$file: changed blabla"
         case $file in
@@ -173,7 +179,7 @@ function file_menu() {
     "${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
+          $(find -type f -and ! -name DETAILS.orig -printf "%P\n"  |sort -f) none
         [[ $file == none ]] && break
         rm $file
         echo "$file removed!"
diff --git a/var/lib/quill/modules/site_handlers/libfreshmeatxml b/var/lib/quill/modules/site_handlers/libfreshmeatxml
index 83c60ac..74b05ee 100644
--- a/var/lib/quill/modules/site_handlers/libfreshmeatxml
+++ b/var/lib/quill/modules/site_handlers/libfreshmeatxml
@@ -3,16 +3,20 @@
 ## @Synopsis libfreshmeatxml
 #---
 
+#---
 ##
 ## @Globals none
+#---
 function quill_fmxml_grab_from_xml() {
   xml_grep --text_only "${@}"
 }
 
+#---
 ##
 ## @Globals SPELL_NAME FRESHMEAT_XML_URL FRESHMEAT_PROJECT_URL SPELL_DESC_NAME
 ## @Globals FRESHMEAT_PROJECT_FILE FRESHMEAT_FILE QUILL_TMP_DIR SPELL_SRC_URL
 ## @Globals SPELL_SRC_URL SPELL_LICENSE SPELL_SHORT_DESCRIPTION
+#---
 function quill_fmxml_core() {
   # so it is set even if we end prematurely, useful when adding spells
   # gets properly overwritten later on
diff --git a/var/lib/quill/modules/site_handlers/libfsfdirectory b/var/lib/quill/modules/site_handlers/libfsfdirectory
index 597621e..604c12b 100644
--- a/var/lib/quill/modules/site_handlers/libfsfdirectory
+++ b/var/lib/quill/modules/site_handlers/libfsfdirectory
@@ -1,8 +1,11 @@
 #!/bin/bash
-#
+#---
 ## FSF/UNESCO directory module
-#
+#---
 
+#---
+##
+#---
 function quill_fsf_get_deps(){
   local data
   local file
@@ -15,9 +18,12 @@ function quill_fsf_get_deps(){
       sed -e "s:<li>\(.*\)\ ($data).*</li>:\1:g" | \
       tr "\n" " " | tr "A-Z" "a-z"
 }
+
+#---
 ##
 ## @Globals SPELL_NAME SPELL_LICENSE SPELL_URL
 ## @Globals QUILL_TMP_DIR
+#---
 function quill_fsf_core(){
   local project
   local fsf_project_file
diff --git a/var/lib/quill/modules/site_handlers/libgna b/var/lib/quill/modules/site_handlers/libgna
index dfebf24..ec5612d 100644
--- a/var/lib/quill/modules/site_handlers/libgna
+++ b/var/lib/quill/modules/site_handlers/libgna
@@ -1,8 +1,11 @@
 #!/bin/bash
-#
+#---
 ## Gna! module
-#
+#---
 
+#---
+##
+#---
 function quill_gna_core(){
   quill_savane_core "${1}" "https://gna.org/projects"
 }
diff --git a/var/lib/quill/modules/site_handlers/libperlcpan b/var/lib/quill/modules/site_handlers/libperlcpan
index 96213d6..b5830da 100644
--- a/var/lib/quill/modules/site_handlers/libperlcpan
+++ b/var/lib/quill/modules/site_handlers/libperlcpan
@@ -3,8 +3,10 @@
 ## @Synopsis Perl-cpan module to generate spells from perl-cpan metadata
 #---
 
+#---
 ##
 ## @Globals QUILL_TMP_DIR
+#---
 function quill_get_manifests()
 {
   # unless someone knows a better way to check files creation time
@@ -32,8 +34,10 @@ function quill_get_manifests()
   fi
 }
 
+#---
 ##
 ## @Globals QUILL_CPAN_INFO QUILL_CPAN_METADATA
+#---
 function quill_get_cpan_meta(){
   eval QUILL_CPAN_INFO="( $(zgrep -w -E "^${1}" $QUILL_TMP_DIR/02packages.details.txt.gz | head -n1) )"
 #  zgrep -w -E "^${1}" $QUILL_TMP_DIR/02packages.details.txt.gz | head -n1
@@ -41,10 +45,12 @@ function quill_get_cpan_meta(){
 #  zgrep -w -B1 -A9 -E "^'${1}'" $QUILL_TMP_DIR/03modlist.data.gz | tr -d "[]" | sed 's:,$::g'
 }
 
+#---
 ##
 ## @Globals QUILL_TMP_DIR SPELL_NAME SPELL_SRC_URL SPELL_VERSION SPELL_LICENSE
 ## @Globals SPELL_SHORT_DESCRIPTION SPELL_URL SPELL_DEPENDENCIES BUILDISON
 ## @Globals DEPENDSISON QUILL_CPAN_INFO QUILL_CPAN_METADATA
+#---
 function quill_cpan_core()
 {
   # so it is set even if we end prematurely, useful when adding spells
diff --git a/var/lib/quill/modules/site_handlers/librubyraa b/var/lib/quill/modules/site_handlers/librubyraa
index cda1265..cb1d1fb 100644
--- a/var/lib/quill/modules/site_handlers/librubyraa
+++ b/var/lib/quill/modules/site_handlers/librubyraa
@@ -1,10 +1,12 @@
 #!/bin/bash
-#
+#---
 ## Ruby RAA module
-#
+#---
 
+#---
 ##
 ## @Globals none
+#---
 function quill_raa_get_info(){
   local info
   local raa_project_file
@@ -13,9 +15,11 @@ function quill_raa_get_info(){
   grep "${info}:" $raa_project_file | sed -e "s/ *${info}: *\(.*\)/\1/"
 }
 
+#---
 ##
 ## @Globals SPELL_NAME SPELL_SHORT_DESCRIPTION SPELL_LICENSE SPELL_URL
 ## @Globals SPELL_SRC_URL SPELL_DEPENDENCIES DEPENDSISON QUILL_TMP_DIR
+#---
 function quill_raa_core(){
   local project
   local desc
diff --git a/var/lib/quill/modules/site_handlers/libsavane b/var/lib/quill/modules/site_handlers/libsavane
index 8649f72..7a77be1 100644
--- a/var/lib/quill/modules/site_handlers/libsavane
+++ b/var/lib/quill/modules/site_handlers/libsavane
@@ -1,11 +1,13 @@
 #!/bin/bash
-#
+#---
 ## Generic savane module
-#
+#---
 
+#---
 ##
 ## @Globals SPELL_NAME SPELL_LICENSE SPELL_URL
 ## @Globals QUILL_TMP_DIR
+#---
 function quill_savane_core(){
   local project
   local project_url
diff --git a/var/lib/quill/modules/site_handlers/libsavannah b/var/lib/quill/modules/site_handlers/libsavannah
index dff8689..189cb8a 100644
--- a/var/lib/quill/modules/site_handlers/libsavannah
+++ b/var/lib/quill/modules/site_handlers/libsavannah
@@ -1,8 +1,11 @@
 #!/bin/bash
-#
+#---
 ## savannah module
-#
+#---
 
+#---
+## savannah
+#---
 function quill_savannah_core(){
   quill_savane_core "${1}" "http://savannah.nongnu.org/projects"
 }



More information about the SM-Commit mailing list