Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master quill by Ismael Luceno (332d95acc28bd7f48a6e65cec29b64beea8633ee)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master quill by Ismael Luceno (332d95acc28bd7f48a6e65cec29b64beea8633ee)
  • Date: Wed, 23 Nov 2016 15:20:18 +0000

GIT changes to master quill by Ismael Luceno <ismael AT sourcemage.org>:

var/lib/quill/modules/libcore | 2 +-
var/lib/quill/modules/libdetails | 16 +++++++++-------
2 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 332d95acc28bd7f48a6e65cec29b64beea8633ee
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libcore, libdetails: Fix naming of Github tarballs

diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 990942f..9b62606 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -70,7 +70,7 @@ function get_spell_source(){
cp $SOURCE_CACHE/$SPELL_SRC_FILE .
message "Done."
else
- wget --no-check-certificate -c "${SPELL_SRC_URL}"
+ wget --no-check-certificate -c "${SPELL_SRC_URL}" -O "$SPELL_SRC_FILE"
fi
echo
cd ${QUILL_SPELL_DIR}/${SPELL_NAME}
diff --git a/var/lib/quill/modules/libdetails
b/var/lib/quill/modules/libdetails
index 517c948..08be920 100644
--- a/var/lib/quill/modules/libdetails
+++ b/var/lib/quill/modules/libdetails
@@ -128,13 +128,15 @@ fi
#---
function parse_spell_source_file_info(){
SPELL_SRC_FILE="${SPELL_SRC_URL##*/}"
- if expr "$SPELL_SRC_FILE" : 'v[0-9]\.' >/dev/null; then
- SPELL_VERSION=$(expr "$SPELL_SRC_FILE" : 'v\(.*\)\.[rtz]')
- elif expr "$SPELL_SRC_FILE" : '[0-9]\.' >/dev/null; then
- SPELL_VERSION=$(expr "$SPELL_SRC_FILE" : '\(.*\)\.[rtz]')
- else
- SPELL_VERSION=$(expr "$SPELL_SRC_FILE" : ".*[-_]\([0-9].*\)\.[rtz]")
- fi
+ case "$SPELL_SRC_FILE" in
+ v[0-9]*|[0-9]*)
+ SPELL_VERSION=$(expr "${SPELL_SRC_FILE#v}" : '\(.*\)\.[rtz]')
+ SPELL_SRC_FILE="$SPELL_NAME-${SPELL_SRC_FILE#v}"
+ ;;
+ *)
+ SPELL_VERSION=$(expr "$SPELL_SRC_FILE" : ".*[-_]\([0-9].*\)\.[rtz]")
+ ;;
+ esac
[[ -n $SPELL_SRC_FILE ]]
}




  • [SM-Commit] GIT changes to master quill by Ismael Luceno (332d95acc28bd7f48a6e65cec29b64beea8633ee), Ismael Luceno, 11/23/2016

Archive powered by MHonArc 2.6.24.

Top of Page