Skip to Content.
Sympa Menu

sm-commit - Re: [SM-Commit] GIT changes to master quill by Jaka Kranjc (912afa0ed45211b1208f279739239822676e1778)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: seth AT swoolley.homeip.net
  • To: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
  • Cc: sm-commit AT lists.ibiblio.org
  • Subject: Re: [SM-Commit] GIT changes to master quill by Jaka Kranjc (912afa0ed45211b1208f279739239822676e1778)
  • Date: Sun, 6 Aug 2006 15:00:55 -0700

instead of doing:
* FILE: entry
entry2
entry3 ...........................
continuation of entry3

my historyfix script doesn't understand the continuation indent, so would be
better:

* FILE: entry; entry2; entry3 .....................
continuation of entry3

unless we want my script to ignore those. An alternative is:
* FILE:
* entry
* entry2
* entry3 ..................................
continuation of entry3

but that doesn't work since it pulls them back assuming they are misindented
first-level asterisks.

I can change its behavior, but I just need a consistent plan for how to
attack it.

Seth

On Sun, Aug 06, 2006 at 04:36:29PM -0500, Jaka Kranjc wrote:
> GIT changes to master quill by Jaka Kranjc <lynxlynxlynx AT sourcemage.org>:
>
> usr/bin/quill | 18 ++++++++++++------
> var/lib/quill/ChangeLog | 13 +++++++++++++
> var/lib/quill/modules/libbuild | 34
> +++++++++++++++-------------------
> var/lib/quill/modules/libconflicts | 3 ---
> var/lib/quill/modules/libcore | 4 ++--
> var/lib/quill/modules/libdepends | 12 +-----------
> var/lib/quill/modules/libdesktop | 4 ----
> var/lib/quill/modules/libdetails | 23 ++++++++++-------------
> var/lib/quill/modules/libinstall | 3 ---
> var/lib/quill/modules/libprepare | 3 ---
> var/lib/quill/modules/libprovides | 3 ---
> var/lib/quill/version | 2 +-
> 12 files changed, 54 insertions(+), 68 deletions(-)
>
> New commits:
> commit 912afa0ed45211b1208f279739239822676e1778
> Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
> Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
>
> move the quill lib sourcing after sorcery, so we can override
> functions
> this was the case with hash_get, now hash generation works.
> substitute SOURCE with variables too
> generate the hash here, where the vars are virgin
> * lib*: removed $*ISON check from add_* functions, quill already
> checks it
> * libbuild, libdetails: fixed indentation
> * libdetails: try SPELL_DESC_NAME first when searching for the
> description
> add some quoting to handle spaces in SOURCE and
> SOURCE_DIRECTORY
> enabled the SOURCE_DIRECTORY extrapolation
> fix substitute_url_variables to use proper vars. Found a bug
> here, we
> either pass the right values or substitute the right vars,
> but not both
> FIXME - disabled this on SOURCE_URL for now, others made to
> work
> * version: 0.1.4
>
> diff --git a/usr/bin/quill b/usr/bin/quill
> index 6a8c4f1..97a4f6d 100755
> --- a/usr/bin/quill
> +++ b/usr/bin/quill
> @@ -42,12 +42,9 @@ ## really basic stuff that should be loa
> . /var/lib/sorcery/modules/libmedia
> LOCAL_MEDIA_CONFIG=/etc/sorcery/local/media source /etc/sorcery/media
> function message() { echo -e "$@"; }
> +. /var/lib/quill/modules/libcore
> ## end of skeletal prerequisites - we get the rest later
>
> -for i in /var/lib/quill/modules/lib*
> -do
> - . $i
> -done
> QUILL_MODE="apprentice"
> HISTORY_DATE="$(date +%Y-%m-%d)"
> #---
> @@ -78,6 +75,10 @@ done
> unset -f message
> . /etc/sorcery/config
> EDITOR=${EDITOR:-nano}
> +for i in /var/lib/quill/modules/lib*
> +do
> + . $i
> +done
>
> QUILL_HOME_DIR=~/.sourcemage/quill
> QUILL_QUILLRC=${QUILL_HOME_DIR}/quillrc
> @@ -182,10 +183,15 @@ then
>
> download_spell_source
>
> - substitute_url_variables
> -
> hunt_src_dir
>
> + # use this once it is possible
> + #substitute_with_variables SPELL_SRC_FILE SPELL_NAME SPELL_VERSION
> + QUILL_SPELL_HASH="$(hash_get ${QUILL_TMP_DIR}/${SPELL_SRC_FILE})"
> + SPELL_SRC_FILE=${SPELL_SRC_FILE//${SPELL_NAME}/\$\{SPELL\}}
> + SPELL_SRC_FILE=${SPELL_SRC_FILE//${SPELL_VERSION}/\$\{VERSION\}}
> + substitute_url_variables
> +
> add_details
>
> if [[ "${PREPAREISON}" == "PREPARE, " ]]
> diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
> index d7f367e..55a84aa 100644
> --- a/var/lib/quill/ChangeLog
> +++ b/var/lib/quill/ChangeLog
> @@ -2,7 +2,20 @@
> * added a global EDITOR fallback and removed the single ones
> removed trailing white space
> * quill: removed CURRENTPWD, wasn't used
> + move the quill lib sourcing after sorcery, so we can override
> functions
> + this was the case with hash_get, now hash generation works.
> + substitute SOURCE with variables too
> + generate the hash here, where the vars are virgin
> * libcore::quil_rc: refactored, reconfiguration saves previous
> settings
> + * lib*: removed $*ISON check from add_* functions, quill already
> checks it
> + * libbuild, libdetails: fixed indentation
> + * libdetails: try SPELL_DESC_NAME first when searching for the
> description
> + add some quoting to handle spaces in SOURCE and SOURCE_DIRECTORY
> + enabled the SOURCE_DIRECTORY extrapolation
> + fix substitute_url_variables to use proper vars. Found a bug here,
> we
> + either pass the right values or substitute the right vars, but
> not both
> + FIXME - disabled this on SOURCE_URL for now, others made to work
> + * version: 0.1.4
>
> 2006-08-06 Andra?? "ruskie" Levstik <ruskie AT mages.ath.cx>
> * version: another bugfix release 0.1.2, uped to 0.1.3
> diff --git a/var/lib/quill/modules/libbuild b/var/lib/quill/modules/libbuild
> index e7a776a..c5f6f81 100644
> --- a/var/lib/quill/modules/libbuild
> +++ b/var/lib/quill/modules/libbuild
> @@ -6,28 +6,24 @@ #---
> BUILDISON=""
>
> function query_spell_build() {
> - if query "Will you be adding a custom BUILD file:" "n"
> - then
> - BUILDISON="BUILD, "
> - fi
> + if query "Will you be adding a custom BUILD file:" "n"
> + then
> + BUILDISON="BUILD, "
> + fi
> }
>
> function add_build() {
> - if [[ "${BUILDISON}" == "BUILD, " ]]
> - then
> - touch BUILD
> - chmod +x BUILD
> - if query "Do you want the default_build function dumped into the
> BUILD file" "n"
> - then
> - (declare -f real_default_build | \
> - tail -n -2 | head -n 1 | sed 's:\(.\{20,41\}\)--:\1\\\n --:g' | \
> - sed "s:&&:\&\&\n:g") > BUILD
> - else
> - echo "default_build" > BUILD
> - fi
> - $EDITOR BUILD
> - fi
> -
> + touch BUILD
> + chmod +x BUILD
> + if query "Do you want the default_build function dumped into the BUILD
> file" "n"
> + then
> + (declare -f real_default_build | \
> + tail -n -2 | head -n 1 | sed 's:\(.\{20,41\}\)--:\1\\\n --:g' | \
> + sed "s:&&:\&\&\n:g") > BUILD
> + else
> + echo "default_build" > BUILD
> + fi
> + $EDITOR BUILD
> }
> #---
> ##
> diff --git a/var/lib/quill/modules/libconflicts
> b/var/lib/quill/modules/libconflicts
> index 07f0ffe..4aab4e4 100644
> --- a/var/lib/quill/modules/libconflicts
> +++ b/var/lib/quill/modules/libconflicts
> @@ -11,8 +11,6 @@ function query_spell_conflicts() {
> }
>
> function add_conflicts() {
> -if [[ "${SPELL_CONFLICTS}" != "" ]]
> -then
> touch CONFLICTS
> chmod +x CONFLICTS
> CONFLICTSISON="CONFLICTS, "
> @@ -20,7 +18,6 @@ then
> do
> echo "conflicts ${n}" >> CONFLICTS
> done
> -fi
> }
> #---
> ##
> diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
> index f03dee9..ae3982c 100644
> --- a/var/lib/quill/modules/libcore
> +++ b/var/lib/quill/modules/libcore
> @@ -94,11 +94,11 @@ #---
> ## @Synopsis used to edit spell files
> #---
> function quill_edit() {
> - message "Now invoking ${EDITOR:-nano} to edit spell files."
> + message "Now invoking $EDITOR to edit spell files."
> cd ${QUILL_SPELL_DIR}/${SPELL_NAME}
> for SPELL_FILE in *
> do
> - ${EDITOR:-nano} ${SPELL_FILE}
> + $EDITOR ${SPELL_FILE}
> done
> message "All modifications complete."
> }
> diff --git a/var/lib/quill/modules/libdepends
> b/var/lib/quill/modules/libdepends
> index 54c10c2..6150e5c 100644
> --- a/var/lib/quill/modules/libdepends
> +++ b/var/lib/quill/modules/libdepends
> @@ -16,8 +16,6 @@ spell if any:${DEFAULT_COLOR}"
> }
>
> function add_dependencies() {
> -if [[ "${SPELL_DEPENDENCIES}" != "" ]]
> -then
> touch DEPENDS
> chmod +x DEPENDS
> DEPENDSISON="DEPENDS, "
> @@ -25,12 +23,9 @@ then
> do
> echo "depends ${i}" >> DEPENDS
> done
> -fi
> }
>
> function add_optional_dependencies() {
> -if [[ "${SPELL_OPTIONAL_DEPENDENCIES[0]}" != "" ]]
> -then
> touch DEPENDS
> chmod +x DEPENDS
> DEPENDSISON="DEPENDS, "
> @@ -46,15 +41,10 @@ then
> read SPELL_OPTIONAL_DEPENDENCIES_DISABLED[$MN]
> message "${QUERY_COLOR}${SPELL_OPTIONAL_DEPENDENCIES[$MN]} needs a
> description${DEFAULT_COLOR}"
> read SPELL_OPTIONAL_DEPENDENCIES_DESCRIPTION[$MN]
> - done
> - for ((MN=0; MN < $NM; MN++))
> - do
> -
> -echo "optional_depends \"${SPELL_OPTIONAL_DEPENDENCIES[$MN]}\"
> \"${SPELL_OPTIONAL_DEPENDENCIES_ENABLED[$MN]}\"
> \"${SPELL_OPTIONAL_DEPENDENCIES_DISABLED[$MN]}\"
> \"${SPELL_OPTIONAL_DEPENDENCIES_DESCRIPTION[$MN]}\"" >> DEPENDS
>
> + echo "optional_depends \"${SPELL_OPTIONAL_DEPENDENCIES[$MN]}\"
> \"${SPELL_OPTIONAL_DEPENDENCIES_ENABLED[$MN]}\"
> \"${SPELL_OPTIONAL_DEPENDENCIES_DISABLED[$MN]}\"
> \"${SPELL_OPTIONAL_DEPENDENCIES_DESCRIPTION[$MN]}\"" >> DEPENDS
> done
> # "optional_depends ${j} \"enabled-option\" \"disabled-option\"
> \"description\""
> -fi
> }
> #---
> ##
> diff --git a/var/lib/quill/modules/libdesktop
> b/var/lib/quill/modules/libdesktop
> index fa71ba2..9992d83 100644
> --- a/var/lib/quill/modules/libdesktop
> +++ b/var/lib/quill/modules/libdesktop
> @@ -23,8 +23,6 @@ fi
> }
>
> add_desktop_file() {
> -if [[ "${BUILD_DTFILE}" != "" ]]
> -then
> mkdir -p desktop
> cd desktop
> echo "[Desktop Entry]" >> ${SPELL_NAME}.desktop
> @@ -38,8 +36,6 @@ then
> echo "Categories=${DTFILE_MENUPATH}" >> ${SPELL_NAME}.desktop
> echo "Term=${DTFILE_TERM}" >> ${SPELL_NAME}.desktop
> cd ..
> -fi
> -
> }
> #---
> ##
> diff --git a/var/lib/quill/modules/libdetails
> b/var/lib/quill/modules/libdetails
> index fb1441d..c3e7706 100644
> --- a/var/lib/quill/modules/libdetails
> +++ b/var/lib/quill/modules/libdetails
> @@ -179,8 +179,8 @@ function hunt_src_dir(){
> if check_if_tarball; then
> SPELL_SRC_DIR=$(tar tf "${QUILL_TMP_DIR}/${SPELL_SRC_FILE}" | grep / |
> sed -e "s=/.*$==g;q")
> if [ -n "$SPELL_SRC_DIR" ]; then
> - SPELL_SRC_DIR=${SPELL_SRC_DIR//${SPELL}/\$\{SPELL\}}
> - SPELL_SRC_DIR=${SPELL_SRC_DIR//${VERSION}/\$\{VERSION\}}
> + SPELL_SRC_DIR=${SPELL_SRC_DIR//${SPELL_NAME}/\$\{SPELL\}}
> + SPELL_SRC_DIR=${SPELL_SRC_DIR//${SPELL_VERSION}/\$\{VERSION\}}
> return 0
> else
> return 1
> @@ -195,30 +195,27 @@ #---
> ## @Synopsis generate DETAILS file
> #---
> function add_details(){
> -QUILL_SPELL_HASH="$(hash_get ${QUILL_TMP_DIR}/${SPELL_SRC_FILE})"
>
> + SPELL_DATE=$(date +%Y%m%d)
>
> -SPELL_DATE=$(date +%Y%m%d)
> -#Generate DETAILS
> -
> -message "Generating DETAILS file..."
> + message "Generating DETAILS file..."
>
> echo \
> -" SPELL=${SPELL_NAME}
> +" SPELL=${SPELL_NAME}
> VERSION=${SPELL_VERSION}
> - SOURCE=${SPELL_SRC_FILE}
> + SOURCE=\"${SPELL_SRC_FILE}\"
> SOURCE_URL[0]=${SPELL_SRC_URL}
> SOURCE_HASH=sha512:${QUILL_SPELL_HASH}
> -SOURCE_DIRECTORY=\${BUILD_DIRECTORY}/\${SPELL}-\${VERSION}
> +SOURCE_DIRECTORY=\"\${BUILD_DIRECTORY}/$SPELL_SRC_DIR\"
> WEB_SITE=${SPELL_URL}
> LICENSE[0]=${SPELL_LICENSE}
> SHORT=\"${SPELL_SHORT_DESCRIPTION}\"
> cat << EOF
> -$(cat ${QUILL_TMP_DIR}/$SPELL_NAME |fmt -u -w80)
> +$(fmt -u -w80 ${QUILL_TMP_DIR}/${SPELL_DESC_NAME:-$SPELL_NAME})
> EOF" > DETAILS
> -rm ${QUILL_TMP_DIR}/$SPELL_NAME
> + rm ${QUILL_TMP_DIR}/${SPELL_DESC_NAME:-$SPELL_NAME}
>
> -message "Done..."
> + message "Done..."
> }
> #---
> ##
> diff --git a/var/lib/quill/modules/libinstall
> b/var/lib/quill/modules/libinstall
> index 46b28f5..0a0a1de 100644
> --- a/var/lib/quill/modules/libinstall
> +++ b/var/lib/quill/modules/libinstall
> @@ -6,8 +6,6 @@ INSTALLISON=""
>
> function add_install()
> {
> -if [[ "${INSTALLISON}" == "INSTALL, " ]]
> -then
> touch INSTALL
> chmod +x INSTALL
> if query "Do you want the default_install function dumped into the
> INSTALL file" "n"
> @@ -17,7 +15,6 @@ then
> echo "default_install" > INSTALL
> fi
> $EDITOR INSTALL
> -fi
> }
>
> function query_spell_install()
> diff --git a/var/lib/quill/modules/libprepare
> b/var/lib/quill/modules/libprepare
> index 2035bb6..2ead1fa 100644
> --- a/var/lib/quill/modules/libprepare
> +++ b/var/lib/quill/modules/libprepare
> @@ -12,12 +12,9 @@ fi
>
> function add_prepare()
> {
> -if [[ "${PREPAREISON}" == "PREPARE, " ]]
> -then
> touch PREPARE
> chmod +x PREPARE
> $EDITOR PREPARE
> -fi
> }
> #---
> ##
> diff --git a/var/lib/quill/modules/libprovides
> b/var/lib/quill/modules/libprovides
> index abbb889..2ce1aca 100644
> --- a/var/lib/quill/modules/libprovides
> +++ b/var/lib/quill/modules/libprovides
> @@ -11,15 +11,12 @@ function query_spell_provides() {
> }
>
> function add_provides() {
> -if [[ "${SPELL_PROVIDES}" != "" ]]
> -then
> touch PROVIDES
> PROVIDESISON="PROVIDES, "
> for n in ${SPELL_PROVIDES}
> do
> echo "${n}" | tr "a-z" "A-Z" >> PROVIDES
> done
> -fi
> }
> #---
> ##
> diff --git a/var/lib/quill/version b/var/lib/quill/version
> index b1e80bb..845639e 100644
> --- a/var/lib/quill/version
> +++ b/var/lib/quill/version
> @@ -1 +1 @@
> -0.1.3
> +0.1.4

> _______________________________________________
> SM-Commit mailing list
> SM-Commit AT lists.ibiblio.org
> http://lists.ibiblio.org/mailman/listinfo/sm-commit





Archive powered by MHonArc 2.6.24.

Top of Page