Skip to Content.
Sympa Menu

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

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 (bf048fd90d7992445daa9bd92741ccd304a5f1b8)
  • Date: Thu, 10 Aug 2006 14:19:21 -0500

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

usr/bin/quill | 4 ++--
var/lib/quill/ChangeLog | 3 +++
var/lib/quill/modules/libcore | 2 +-
var/lib/quill/modules/libdetails | 2 ++
var/lib/quill/modules/libfreshmeatxml | 3 +--
5 files changed, 9 insertions(+), 5 deletions(-)

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

* libdetails: substitute prdownloads SF pseudolinks too * libcore,
quill: use appropriate exit codes when terminating in quill_help *
libfreshmeatxml: removed unused variable

diff --git a/usr/bin/quill b/usr/bin/quill
index 1cabf1f..e415c9c 100755
--- a/usr/bin/quill
+++ b/usr/bin/quill
@@ -55,7 +55,7 @@ while [ -n "$1" ]; do
--fmxml|-f)
[[ -z $2 ]] &&
message "${PROBLEM_COLOR}Missing parameter$DEFAULT_COLOR"
&&
- quill_help
+ quill_help 101
export QUILL_FMXML_MODE="on"; export QUILL_FMXML_PARAM="$2"
shift 2 ;;
--apprentice|-a) export QUILL_MODE="apprentice"; shift 1 ;;
@@ -65,7 +65,7 @@ while [ -n "$1" ]; do
--help|-h) quill_help ;;
--version|-v) quill_version ;;
*) message "${PROBLEM_COLOR}Invalid parameter
$1$DEFAULT_COLOR"
- quill_help ;;
+ quill_help 102;;
esac
else
shift
diff --git a/var/lib/quill/ChangeLog b/var/lib/quill/ChangeLog
index d45d7b2..bc2204e 100644
--- a/var/lib/quill/ChangeLog
+++ b/var/lib/quill/ChangeLog
@@ -6,6 +6,9 @@
2006-08-10 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* install.sh: fix #12951, install.sh was failing with staging or sth
* version: 0.1.5
+ * libdetails: substitute prdownloads SF pseudolinks too
+ * libcore, quill: use appropriate exit codes when terminating in
quill_help
+ * libfreshmeatxml: removed unused variable

2006-08-09 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libcore: made the get_spell_source output more consistent
diff --git a/var/lib/quill/modules/libcore b/var/lib/quill/modules/libcore
index 3b3ab18..452f027 100644
--- a/var/lib/quill/modules/libcore
+++ b/var/lib/quill/modules/libcore
@@ -201,6 +201,6 @@ OPTIONS:
--version, -v display version
--reconfigure, -r reconfigure settings
"
- exit 0
+ exit ${1:-0}
}

diff --git a/var/lib/quill/modules/libdetails
b/var/lib/quill/modules/libdetails
index 6a9866d..63d74c5 100644
--- a/var/lib/quill/modules/libdetails
+++ b/var/lib/quill/modules/libdetails
@@ -140,6 +140,8 @@ if [[ -n $1 ]]; then
fi
done < <(sed 's,^.*\s\s*,,' $mirror_list)
done
+ # misc sf fix
+ target_value=$(sed
's,http://prdownloads.sourceforge.net,$SOURCEFORGE_URL,' <<< $target_value)
eval "$target=\"\$target_value\""
fi
}
diff --git a/var/lib/quill/modules/libfreshmeatxml
b/var/lib/quill/modules/libfreshmeatxml
index 6159c5d..bf89851 100644
--- a/var/lib/quill/modules/libfreshmeatxml
+++ b/var/lib/quill/modules/libfreshmeatxml
@@ -39,7 +39,6 @@ function quill_fmxml_core(){
exit 1
fi
FRESHMEAT_FILE=$FRESHMEAT_FILE
- unset FILE
fi

# check that the project was found - exsists
@@ -63,7 +62,7 @@ function quill_fmxml_core(){
done
SPELL_URL=$(curl -I $(quill_fmxml_grab_from_xml url_homepage $1) 2>&1|\
grep Location|awk '{print $2}'|sed 's/\r//g')
-
+
SPELL_LICENSE=$(quill_fmxml_grab_from_xml license $1)
if grep -q "(.*)" <<< "$SPELL_LICENSE"; then
SPELL_LICENSE=$(awk '{print $NF}' <<< "$SPELL_LICENSE" | tr -d '()')



  • [SM-Commit] GIT changes to master quill by Jaka Kranjc (bf048fd90d7992445daa9bd92741ccd304a5f1b8), Jaka Kranjc, 08/10/2006

Archive powered by MHonArc 2.6.24.

Top of Page