Skip to Content.
Sympa Menu

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

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 sorcery by Jaka Kranjc (c54fd8c528cbeba432e824bd001b08bf7d1c6089)
  • Date: Wed, 25 Feb 2009 11:44:50 -0600

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

ChangeLog | 5 +++++
usr/sbin/gaze | 17 +++++++++--------
var/lib/sorcery/modules/libsorcery | 21 ++++++++++-----------
3 files changed, 24 insertions(+), 19 deletions(-)

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

libsorcery: added support for non-archive files to guess_filename
* gaze: use guess_filename to search for the compile log, so it still
works if the user changed his compressor

diff --git a/ChangeLog b/ChangeLog
index 87bf23d..c275b71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-02-25 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * libsorcery: added support for non-archive files to guess_filename
+ * gaze: use guess_filename to search for the compile log, so it still
+ works if the user changed his compressor
+
2009-02-24 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
* libmisc: added missing quotes to right hand side of checks in
smgl_dirname, so unwanted glob expansion doesn't occur; this
diff --git a/usr/sbin/gaze b/usr/sbin/gaze
index 585512e..60adfec 100755
--- a/usr/sbin/gaze
+++ b/usr/sbin/gaze
@@ -573,14 +573,15 @@ function gaze_catalog_html() {
## @param Message to display if file doesn't exist
#-----
function display() {
-
- if [ -s "$1" ]; then
- case "$(file -b $1)" in
- *text) cat $1 | $PAGER ;;
- bzip2*) bzcat $1 | $PAGER ;;
- gzip*) gzip -cd $1 | $PAGER ;;
- *) message "Unknown file type."
- return 1 ;;
+ local file=$(FUZZ=on guess_filename "$1")
+
+ if [[ -s $file ]]; then
+ case "$(file -b "$file")" in
+ *text) cat "$file" | $PAGER ;;
+ bzip2*) bzcat "$file" | $PAGER ;;
+ gzip*) gzip -cd "$file" | $PAGER ;;
+ *) message "Unknown file type."
+ return 1 ;;
esac
else
message "$2" 1>&2
diff --git a/var/lib/sorcery/modules/libsorcery
b/var/lib/sorcery/modules/libsorcery
index 850953a..02cc574 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -219,20 +219,19 @@ function guess_filename() {
if [[ -f $filename ]]; then
echo $filename
else
- #FIXME this is never defined, check if this function still makes sense
+ # currently only used from gaze
if [[ $FUZZ != on ]]; then
return 1
else
- local basename=$(sed -r "s/\.(tar\.(gz|bz2)|tgz)$//" <<< "$filename")
- if [[ -f $basename.tar.gz ]]; then
- echo $basename.tar.gz
- elif [[ -f $basename.tar.bz2 ]]; then
- echo $basename.tar.bz2
- elif [[ -f $basename.tgz ]]; then
- echo $basename.tgz
- else
- return 1
- fi
+ local basename=$(sed -r "s/\.(tar\.(gz|bz2)|tgz|gz|bz2)$//" <<<
"$filename")
+ local extension
+ for extension in tar.gz tar.bz2 tgz gz bz2; do
+ if [[ -f $basename.$extension ]]; then
+ echo $basename.$extension
+ return 0
+ fi
+ done
+ return 1
fi
fi




  • [SM-Commit] GIT changes to master sorcery by Jaka Kranjc (c54fd8c528cbeba432e824bd001b08bf7d1c6089), Jaka Kranjc, 02/25/2009

Archive powered by MHonArc 2.6.24.

Top of Page